fix: stabilize macos build

apps/macos/Sources/Clawdis/AppState.swift

@@ -254,41 +254,41 @@ final class AppState {
         let configRoot = ClawdisConfigFile.loadDict()
         let configGateway = configRoot["gateway"] as? [String: Any]
         let configModeRaw = (configGateway?["mode"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-        let configMode: ConnectionMode? = {
+        let configMode: ConnectionMode? = switch configModeRaw {
-            switch configModeRaw {
+        case "local":
-            case "local":
+            .local
-                return .local
+        case "remote":
-            case "remote":
+            .remote
-                return .remote
+        default:
-            default:
+            nil
-                return nil
+        }
-            }
-        }()
         let configRemoteUrl = (configGateway?["remote"] as? [String: Any])?["url"] as? String
         let configHasRemoteUrl = !(configRemoteUrl?
             .trimmingCharacters(in: .whitespacesAndNewlines)
             .isEmpty ?? true)
 
         let storedMode = UserDefaults.standard.string(forKey: connectionModeKey)
-        if let configMode {
+        let resolvedConnectionMode: ConnectionMode = if let configMode {
-            self.connectionMode = configMode
+            configMode
         } else if configHasRemoteUrl {
-            self.connectionMode = .remote
+            .remote
         } else if let storedMode {
-            self.connectionMode = ConnectionMode(rawValue: storedMode) ?? .local
+            ConnectionMode(rawValue: storedMode) ?? .local
         } else {
-            self.connectionMode = onboardingSeen ? .local : .unconfigured
+            onboardingSeen ? .local : .unconfigured
         }
+        self.connectionMode = resolvedConnectionMode
 
         let storedRemoteTarget = UserDefaults.standard.string(forKey: remoteTargetKey) ?? ""
-        if self.connectionMode == .remote,
+        let resolvedRemoteTarget = if resolvedConnectionMode == .remote,
-           storedRemoteTarget.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty,
+                                      storedRemoteTarget.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty,
-           let host = AppState.remoteHost(from: configRemoteUrl)
+                                      let host = AppState.remoteHost(from: configRemoteUrl)
         {
-            self.remoteTarget = "\(NSUserName())@\(host)"
+            "\(NSUserName())@\(host)"
         } else {
-            self.remoteTarget = storedRemoteTarget
+            storedRemoteTarget
         }
+        self.remoteTarget = resolvedRemoteTarget
         self.remoteIdentity = UserDefaults.standard.string(forKey: remoteIdentityKey) ?? ""
         self.remoteProjectRoot = UserDefaults.standard.string(forKey: remoteProjectRootKey) ?? ""
         self.remoteCliPath = UserDefaults.standard.string(forKey: remoteCliPathKey) ?? ""
@@ -322,10 +322,6 @@ final class AppState {
         }
     }
 
-    deinit {
-        self.configWatcher?.stop()
-    }
-
     private static func remoteHost(from urlString: String?) -> String? {
         guard let raw = urlString?.trimmingCharacters(in: .whitespacesAndNewlines),
               !raw.isEmpty,
@@ -361,18 +357,16 @@ final class AppState {
             .trimmingCharacters(in: .whitespacesAndNewlines)
             .isEmpty ?? true)
 
-        let desiredMode: ConnectionMode? = {
+        let desiredMode: ConnectionMode? = switch modeRaw {
-            switch modeRaw {
+        case "local":
-            case "local":
+            .local
-                return .local
+        case "remote":
-            case "remote":
+            .remote
-                return .remote
+        case "unconfigured":
-            case "unconfigured":
+            .unconfigured
-                return .unconfigured
+        default:
-            default:
+            nil
-                return nil
+        }
-            }
-        }()
 
         if let desiredMode {
             if desiredMode != self.connectionMode {
@@ -407,14 +401,13 @@ final class AppState {
         var gateway = root["gateway"] as? [String: Any] ?? [:]
         var changed = false
 
-        let desiredMode: String?
+        let desiredMode: String? = switch self.connectionMode {
-        switch self.connectionMode {
         case .local:
-            desiredMode = "local"
+            "local"
         case .remote:
-            desiredMode = "remote"
+            "remote"
         case .unconfigured:
-            desiredMode = nil
+            nil
         }
 
         let currentMode = (gateway["mode"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)

apps/macos/Sources/Clawdis/CameraCaptureService.swift

@@ -244,7 +244,7 @@ actor CameraCaptureService {
         deviceId: String?) -> AVCaptureDevice?
     {
         if let deviceId, !deviceId.isEmpty {
-            if let match = Self.availableCameras().first(where: { $0.uniqueID == deviceId }) {
+            if let match = availableCameras().first(where: { $0.uniqueID == deviceId }) {
                 return match
             }
         }
@@ -331,7 +331,7 @@ actor CameraCaptureService {
 
     private func sleepDelayMs(_ delayMs: Int) async {
         guard delayMs > 0 else { return }
-        let ns = UInt64(min(delayMs, 10_000)) * 1_000_000
+        let ns = UInt64(min(delayMs, 10000)) * 1_000_000
         try? await Task.sleep(nanoseconds: ns)
     }
 

apps/macos/Sources/Clawdis/ClawdisConfigFile.swift

@@ -100,7 +100,8 @@ enum ClawdisConfigFile {
     static func gatewayPassword() -> String? {
         let root = self.loadDict()
         guard let gateway = root["gateway"] as? [String: Any],
-              let remote = gateway["remote"] as? [String: Any] else {
+              let remote = gateway["remote"] as? [String: Any]
+        else {
             return nil
         }
         return remote["password"] as? String
@@ -121,5 +122,4 @@ enum ClawdisConfigFile {
         }
         return nil
     }
-
 }

apps/macos/Sources/Clawdis/CommandResolver.swift

@@ -157,7 +157,7 @@ enum CommandResolver {
     }
 
     static func findExecutable(named name: String, searchPaths: [String]? = nil) -> String? {
-        for dir in (searchPaths ?? self.preferredPaths()) {
+        for dir in searchPaths ?? self.preferredPaths() {
             let candidate = (dir as NSString).appendingPathComponent(name)
             if FileManager.default.isExecutableFile(atPath: candidate) {
                 return candidate

apps/macos/Sources/Clawdis/ConfigFileWatcher.swift

@@ -90,8 +90,8 @@ extension ConfigFileWatcher {
     private func handleEvents(
         numEvents: Int,
         eventPaths: UnsafeMutableRawPointer?,
-        eventFlags: UnsafePointer<FSEventStreamEventFlags>?
+        eventFlags: UnsafePointer<FSEventStreamEventFlags>?)
-    ) {
+    {
         guard numEvents > 0 else { return }
         guard eventFlags != nil else { return }
         guard self.matchesTarget(eventPaths: eventPaths) else { return }

apps/macos/Sources/Clawdis/ConfigStore.swift

@@ -78,7 +78,7 @@ enum ConfigStore {
         let data = try JSONSerialization.data(withJSONObject: root, options: [.prettyPrinted, .sortedKeys])
         guard let raw = String(data: data, encoding: .utf8) else {
             throw NSError(domain: "ConfigStore", code: 1, userInfo: [
-                NSLocalizedDescriptionKey: "Failed to encode config."
+                NSLocalizedDescriptionKey: "Failed to encode config.",
             ])
         }
         let params: [String: AnyCodable] = ["raw": AnyCodable(raw)]
@@ -88,7 +88,7 @@ enum ConfigStore {
             timeoutMs: 10000)
     }
 
-#if DEBUG
+    #if DEBUG
     static func _testSetOverrides(_ overrides: Overrides) async {
         await self.overrideStore.setOverride(overrides)
     }
@@ -96,5 +96,5 @@ enum ConfigStore {
     static func _testClearOverrides() async {
         await self.overrideStore.setOverride(.init())
     }
-#endif
+    #endif
 }

apps/macos/Sources/Clawdis/ConnectionsSettings.swift

@@ -492,7 +492,7 @@ struct ConnectionsSettings: View {
 
             GroupBox("Guilds") {
                 VStack(alignment: .leading, spacing: 12) {
-                    ForEach($store.discordGuilds) { $guild in
+                    ForEach(self.$store.discordGuilds) { $guild in
                         VStack(alignment: .leading, spacing: 10) {
                             HStack {
                                 TextField("guild id or slug", text: $guild.key)

apps/macos/Sources/Clawdis/ConnectionsStore.swift

@@ -172,8 +172,8 @@ struct DiscordGuildForm: Identifiable {
         requireMention: Bool = false,
         reactionNotifications: String = "own",
         users: String = "",
-        channels: [DiscordGuildChannelForm] = []
+        channels: [DiscordGuildChannelForm] = [])
-    ) {
+    {
         self.key = key
         self.slug = slug
         self.requireMention = requireMention
@@ -473,12 +473,16 @@ final class ConnectionsStore {
             } else {
                 self.discordMediaMaxMb = ""
             }
-            if let history = discord?["historyLimit"]?.doubleValue ?? discord?["historyLimit"]?.intValue.map(Double.init) {
+            if let history = discord?["historyLimit"]?.doubleValue ?? discord?["historyLimit"]?.intValue
+                .map(Double.init)
+            {
                 self.discordHistoryLimit = String(Int(history))
             } else {
                 self.discordHistoryLimit = ""
             }
-            if let limit = discord?["textChunkLimit"]?.doubleValue ?? discord?["textChunkLimit"]?.intValue.map(Double.init) {
+            if let limit = discord?["textChunkLimit"]?.doubleValue ?? discord?["textChunkLimit"]?.intValue
+                .map(Double.init)
+            {
                 self.discordTextChunkLimit = String(Int(limit))
             } else {
                 self.discordTextChunkLimit = ""
@@ -506,9 +510,10 @@ final class ConnectionsStore {
                                 return nil
                             }
                             .joined(separator: ", ") ?? ""
-                        let channels: [DiscordGuildChannelForm]
+                        let channels: [DiscordGuildChannelForm] = if let channelMap = entry["channels"]?
-                        if let channelMap = entry["channels"]?.dictionaryValue {
+                            .dictionaryValue
-                            channels = channelMap.map { channelKey, channelValue in
+                        {
+                            channelMap.map { channelKey, channelValue in
                                 let channelEntry = channelValue.dictionaryValue ?? [:]
                                 let allow = channelEntry["allow"]?.boolValue ?? true
                                 let channelRequireMention =
@@ -519,7 +524,7 @@ final class ConnectionsStore {
                                     requireMention: channelRequireMention)
                             }
                         } else {
-                            channels = []
+                            []
                         }
                         return DiscordGuildForm(
                             key: key,

apps/macos/Sources/Clawdis/ContextUsageBar.swift

@@ -12,11 +12,13 @@ struct ContextUsageBar: View {
         if match == .darkAqua { return base }
         return base.blended(withFraction: 0.24, of: .black) ?? base
     }
+
     private static let trackFill: NSColor = .init(name: nil) { appearance in
         let match = appearance.bestMatch(from: [.aqua, .darkAqua])
         if match == .darkAqua { return NSColor.white.withAlphaComponent(0.14) }
         return NSColor.black.withAlphaComponent(0.12)
     }
+
     private static let trackStroke: NSColor = .init(name: nil) { appearance in
         let match = appearance.bestMatch(from: [.aqua, .darkAqua])
         if match == .darkAqua { return NSColor.white.withAlphaComponent(0.22) }

apps/macos/Sources/Clawdis/ControlChannel.swift

@@ -55,8 +55,8 @@ final class ControlChannel {
     private(set) var state: ConnectionState = .disconnected {
         didSet {
             CanvasManager.shared.refreshDebugStatus()
-            guard oldValue != state else { return }
+            guard oldValue != self.state else { return }
-            switch state {
+            switch self.state {
             case .connected:
                 self.logger.info("control channel state -> connected")
             case .connecting:
@@ -71,6 +71,7 @@ final class ControlChannel {
             }
         }
     }
+
     private(set) var lastPingMs: Double?
 
     private let logger = Logger(subsystem: "com.clawdis", category: "control")

apps/macos/Sources/Clawdis/DeviceModelCatalog.swift

@@ -138,17 +138,20 @@ enum DeviceModelCatalog {
         if bundle.url(
             forResource: "ios-device-identifiers",
             withExtension: "json",
-            subdirectory: self.resourceSubdirectory) != nil {
+            subdirectory: self.resourceSubdirectory) != nil
+        {
             return bundle
         }
         if bundle.url(
             forResource: "mac-device-identifiers",
             withExtension: "json",
-            subdirectory: self.resourceSubdirectory) != nil {
+            subdirectory: self.resourceSubdirectory) != nil
+        {
             return bundle
         }
         return nil
     }
+
     private enum NameValue: Decodable {
         case string(String)
         case stringArray([String])

apps/macos/Sources/Clawdis/GatewayConnection.swift

@@ -237,8 +237,9 @@ actor GatewayConnection {
         guard let snapshot = self.lastSnapshot else { return (nil, nil) }
         let configPath = snapshot.snapshot.configpath?.trimmingCharacters(in: .whitespacesAndNewlines)
         let stateDir = snapshot.snapshot.statedir?.trimmingCharacters(in: .whitespacesAndNewlines)
-        return (configPath?.isEmpty == false ? configPath : nil,
+        return (
-                stateDir?.isEmpty == false ? stateDir : nil)
+            configPath?.isEmpty == false ? configPath : nil,
+            stateDir?.isEmpty == false ? stateDir : nil)
     }
 
     func subscribe(bufferingNewest: Int = 100) -> AsyncStream<GatewayPush> {
@@ -270,7 +271,9 @@ actor GatewayConnection {
     }
 
     private func configure(url: URL, token: String?, password: String?) async {
-        if self.client != nil, self.configuredURL == url, self.configuredToken == token, self.configuredPassword == password {
+        if self.client != nil, self.configuredURL == url, self.configuredToken == token,
+           self.configuredPassword == password
+        {
             return
         }
         if let client {

apps/macos/Sources/Clawdis/GatewayEndpointStore.swift

@@ -40,8 +40,8 @@ actor GatewayEndpointStore {
     private static func resolveGatewayPassword(
         isRemote: Bool,
         root: [String: Any],
-        env: [String: String]
+        env: [String: String]) -> String?
-    ) -> String? {
+    {
         let raw = env["CLAWDIS_GATEWAY_PASSWORD"] ?? ""
         let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
         if !trimmed.isEmpty {
@@ -93,7 +93,11 @@ actor GatewayEndpointStore {
         let password = deps.password()
         switch initialMode {
         case .local:
-            self.state = .ready(mode: .local, url: URL(string: "ws://127.0.0.1:\(port)")!, token: token, password: password)
+            self.state = .ready(
+                mode: .local,
+                url: URL(string: "ws://127.0.0.1:\(port)")!,
+                token: token,
+                password: password)
         case .remote:
             self.state = .unavailable(mode: .remote, reason: "Remote mode enabled but no active control tunnel")
         case .unconfigured:
@@ -125,14 +129,22 @@ actor GatewayEndpointStore {
         switch mode {
         case .local:
             let port = self.deps.localPort()
-            self.setState(.ready(mode: .local, url: URL(string: "ws://127.0.0.1:\(port)")!, token: token, password: password))
+            self.setState(.ready(
+                mode: .local,
+                url: URL(string: "ws://127.0.0.1:\(port)")!,
+                token: token,
+                password: password))
         case .remote:
             let port = await self.deps.remotePortIfRunning()
             guard let port else {
                 self.setState(.unavailable(mode: .remote, reason: "Remote mode enabled but no active control tunnel"))
                 return
             }
-            self.setState(.ready(mode: .remote, url: URL(string: "ws://127.0.0.1:\(Int(port))")!, token: token, password: password))
+            self.setState(.ready(
+                mode: .remote,
+                url: URL(string: "ws://127.0.0.1:\(Int(port))")!,
+                token: token,
+                password: password))
         case .unconfigured:
             self.setState(.unavailable(mode: .unconfigured, reason: "Gateway not configured"))
         }
@@ -213,8 +225,8 @@ extension GatewayEndpointStore {
     static func _testResolveGatewayPassword(
         isRemote: Bool,
         root: [String: Any],
-        env: [String: String]
+        env: [String: String]) -> String?
-    ) -> String? {
+    {
         self.resolveGatewayPassword(isRemote: isRemote, root: root, env: env)
     }
 }

apps/macos/Sources/Clawdis/GatewayLaunchAgentManager.swift

@@ -24,7 +24,7 @@ enum GatewayLaunchAgentManager {
     }
 
     private static func gatewayProgramArguments(bundlePath: String, port: Int, bind: String) -> [String] {
-#if DEBUG
+        #if DEBUG
         let projectRoot = CommandResolver.projectRoot()
         if let localBin = CommandResolver.projectClawdisExecutable(projectRoot: projectRoot) {
             return [localBin, "gateway", "--port", "\(port)", "--bind", bind]
@@ -38,7 +38,7 @@ enum GatewayLaunchAgentManager {
                 subcommand: "gateway",
                 extraArgs: ["--port", "\(port)", "--bind", bind])
         }
-#endif
+        #endif
         let gatewayBin = self.gatewayExecutablePath(bundlePath: bundlePath)
         return [gatewayBin, "gateway-daemon", "--port", "\(port)", "--bind", bind]
     }
@@ -51,7 +51,7 @@ enum GatewayLaunchAgentManager {
 
     static func set(enabled: Bool, bundlePath: String, port: Int) async -> String? {
         if enabled {
-            _ = await self.runLaunchctl(["bootout", "gui/\(getuid())/\(legacyGatewayLaunchdLabel)"])
+            _ = await self.runLaunchctl(["bootout", "gui/\(getuid())/\(self.legacyGatewayLaunchdLabel)"])
             try? FileManager.default.removeItem(at: self.legacyPlistURL)
             let gatewayBin = self.gatewayExecutablePath(bundlePath: bundlePath)
             guard FileManager.default.isExecutableFile(atPath: gatewayBin) else {

apps/macos/Sources/Clawdis/GeneralSettings.swift

@@ -151,16 +151,16 @@ struct GeneralSettings: View {
     private func requestLocationAuthorization(mode: ClawdisLocationMode) async -> Bool {
         guard mode != .off else { return true }
         let status = CLLocationManager.authorizationStatus()
-        if status == .authorizedAlways || status == .authorizedWhenInUse {
+        if status == .authorizedAlways || status == .authorized {
-            if mode == .always && status != .authorizedAlways {
+            if mode == .always, status != .authorizedAlways {
                 let updated = await LocationPermissionRequester.shared.request(always: true)
-                return updated == .authorizedAlways || updated == .authorizedWhenInUse
+                return updated == .authorizedAlways || updated == .authorized
             }
             return true
         }
         let updated = await LocationPermissionRequester.shared.request(always: mode == .always)
         switch updated {
-        case .authorizedAlways, .authorizedWhenInUse:
+        case .authorizedAlways, .authorized:
             return true
         default:
             return false

apps/macos/Sources/Clawdis/LaunchAgentManager.swift

@@ -6,6 +6,7 @@ enum LaunchAgentManager {
         FileManager.default.homeDirectoryForCurrentUser
             .appendingPathComponent("Library/LaunchAgents/com.clawdis.mac.plist")
     }
+
     private static var legacyPlistURL: URL {
         FileManager.default.homeDirectoryForCurrentUser
             .appendingPathComponent("Library/LaunchAgents/\(legacyLaunchdLabel).plist")
@@ -19,7 +20,7 @@ enum LaunchAgentManager {
 
     static func set(enabled: Bool, bundlePath: String) async {
         if enabled {
-            _ = await self.runLaunchctl(["bootout", "gui/\(getuid())/\(legacyLaunchdLabel)"])
+            _ = await self.runLaunchctl(["bootout", "gui/\(getuid())/\(self.legacyLaunchdLabel)"])
             try? FileManager.default.removeItem(at: self.legacyPlistURL)
             self.writePlist(bundlePath: bundlePath)
             _ = await self.runLaunchctl(["bootout", "gui/\(getuid())/\(launchdLabel)"])

apps/macos/Sources/Clawdis/Logging/ClawdisLogging.swift

@@ -1,7 +1,7 @@
-@_exported import Logging
 import Foundation
-import OSLog
+@_exported import Logging
 import os
+import OSLog
 
 typealias Logger = Logging.Logger
 
@@ -65,15 +65,15 @@ enum ClawdisLogging {
     }()
 
     static func bootstrapIfNeeded() {
-        _ = Self.didBootstrap
+        _ = self.didBootstrap
     }
 
     static func makeLabel(subsystem: String, category: String) -> String {
-        "\(subsystem)\(Self.labelSeparator)\(category)"
+        "\(subsystem)\(self.labelSeparator)\(category)"
     }
 
     static func parseLabel(_ label: String) -> (String, String) {
-        guard let range = label.range(of: Self.labelSeparator) else {
+        guard let range = label.range(of: labelSeparator) else {
             return ("com.clawdis", label)
         }
         let subsystem = String(label[..<range.lowerBound])
@@ -91,7 +91,7 @@ extension Logging.Logger {
 }
 
 extension Logger.Message.StringInterpolation {
-    mutating func appendInterpolation<T>(_ value: T, privacy: OSLogPrivacy) {
+    mutating func appendInterpolation(_ value: some Any, privacy: OSLogPrivacy) {
         self.appendInterpolation(String(describing: value))
     }
 }
@@ -132,15 +132,15 @@ struct ClawdisOSLogHandler: LogHandler {
     private static func osLogType(for level: Logger.Level) -> OSLogType {
         switch level {
         case .trace, .debug:
-            return .debug
+            .debug
         case .info, .notice:
-            return .info
+            .info
         case .warning:
-            return .default
+            .default
         case .error:
-            return .error
+            .error
         case .critical:
-            return .fault
+            .fault
         }
     }
 
@@ -156,7 +156,7 @@ struct ClawdisOSLogHandler: LogHandler {
         guard !metadata.isEmpty else { return message.description }
         let meta = metadata
             .sorted(by: { $0.key < $1.key })
-            .map { "\($0.key)=\(stringify($0.value))" }
+            .map { "\($0.key)=\(self.stringify($0.value))" }
             .joined(separator: " ")
         return "\(message.description) [\(meta)]"
     }
@@ -168,9 +168,9 @@ struct ClawdisOSLogHandler: LogHandler {
         case let .stringConvertible(value):
             String(describing: value)
         case let .array(values):
-            "[" + values.map { stringify($0) }.joined(separator: ",") + "]"
+            "[" + values.map { self.stringify($0) }.joined(separator: ",") + "]"
         case let .dictionary(entries):
-            "{" + entries.map { "\($0.key)=\(stringify($0.value))" }.joined(separator: ",") + "}"
+            "{" + entries.map { "\($0.key)=\(self.stringify($0.value))" }.joined(separator: ",") + "}"
         }
     }
 }
@@ -224,9 +224,9 @@ struct ClawdisFileLogHandler: LogHandler {
         case let .stringConvertible(value):
             String(describing: value)
         case let .array(values):
-            "[" + values.map { stringify($0) }.joined(separator: ",") + "]"
+            "[" + values.map { self.stringify($0) }.joined(separator: ",") + "]"
         case let .dictionary(entries):
-            "{" + entries.map { "\($0.key)=\(stringify($0.value))" }.joined(separator: ",") + "}"
+            "{" + entries.map { "\($0.key)=\(self.stringify($0.value))" }.joined(separator: ",") + "}"
         }
     }
 }

apps/macos/Sources/Clawdis/MenuContentView.swift

@@ -172,7 +172,7 @@ struct MenuContent: View {
     }
 
     @MainActor
-    private static func buildAndSaveBrowserEnabled(_ enabled: Bool) async -> (Bool,()) {
+    private static func buildAndSaveBrowserEnabled(_ enabled: Bool) async -> (Bool, ()) {
         var root = await ConfigStore.load()
         var browser = root["browser"] as? [String: Any] ?? [:]
         browser["enabled"] = enabled

apps/macos/Sources/Clawdis/MenuHighlightedHostView.swift

@@ -86,7 +86,6 @@ final class HighlightedMenuItemHostView: NSView {
         self.frame = NSRect(origin: .zero, size: NSSize(width: width, height: size.height))
         self.invalidateIntrinsicContentSize()
     }
-
 }
 
 struct MenuHostedHighlightedItem: NSViewRepresentable {

apps/macos/Sources/Clawdis/MenuSessionsInjector.swift

@@ -435,7 +435,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         compact.representedObject = row.key
         menu.addItem(compact)
 
-        if row.key != "main" && row.key != "global" {
+        if row.key != "main", row.key != "global" {
             let del = NSMenuItem(title: "Delete Session", action: #selector(self.deleteSession(_:)), keyEquivalent: "")
             del.target = self
             del.representedObject = row.key
@@ -541,12 +541,14 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         menu.addItem(self.makeNodeDetailItem(label: "Paired", value: entry.isPaired ? "Yes" : "No"))
 
         if let caps = entry.caps?.filter({ !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }),
-           !caps.isEmpty {
+           !caps.isEmpty
+        {
             menu.addItem(self.makeNodeCopyItem(label: "Caps", value: caps.joined(separator: ", ")))
         }
 
         if let commands = entry.commands?.filter({ !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }),
-           !commands.isEmpty {
+           !commands.isEmpty
+        {
             menu.addItem(self.makeNodeMultilineItem(
                 label: "Commands",
                 value: commands.joined(separator: ", "),
@@ -589,6 +591,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         }
         return trimmed
     }
+
     @objc
     private func patchThinking(_ sender: NSMenuItem) {
         guard let dict = sender.representedObject as? [String: Any],
@@ -770,7 +773,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
     }
 
     private func sortedNodeEntries() -> [NodeInfo] {
-        let entries = self.nodesStore.nodes.filter { $0.isConnected }
+        let entries = self.nodesStore.nodes.filter(\.isConnected)
         return entries.sorted { lhs, rhs in
             if lhs.isConnected != rhs.isConnected { return lhs.isConnected }
             if lhs.isPaired != rhs.isPaired { return lhs.isPaired }
@@ -781,8 +784,6 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         }
     }
 
-
-
     // MARK: - Views
 
     private func makeHostedView(rootView: AnyView, width: CGFloat, highlighted: Bool) -> NSView {

apps/macos/Sources/Clawdis/NodeMode/MacNodeBridgePairingClient.swift

@@ -192,6 +192,4 @@ actor MacNodeBridgePairingClient {
             }
         }
     }
-
-    
 }

apps/macos/Sources/Clawdis/NodeMode/MacNodeBridgeSession.swift

@@ -325,6 +325,4 @@ actor MacNodeBridgeSession {
                 ])
             })
     }
-
-
 }

apps/macos/Sources/Clawdis/NodeMode/MacNodeLocationService.swift

@@ -3,7 +3,7 @@ import CoreLocation
 import Foundation
 
 @MainActor
-final class MacNodeLocationService: NSObject, CLLocationManagerDelegate {
+final class MacNodeLocationService: NSObject {
     enum Error: Swift.Error {
         case timeout
         case unavailable
@@ -47,10 +47,8 @@ final class MacNodeLocationService: NSObject, CLLocationManagerDelegate {
         }
 
         self.manager.desiredAccuracy = Self.accuracyValue(desiredAccuracy)
-        let timeout = max(0, timeoutMs ?? 10_000)
+        let timeout = max(0, timeoutMs ?? 10000)
-        return try await self.withTimeout(timeoutMs: timeout) {
+        return try await self.requestLocationWithTimeout(timeoutMs: timeout)
-            try await self.requestLocation()
-        }
     }
 
     private func requestLocation() async throws -> CLLocation {
@@ -60,34 +58,50 @@ final class MacNodeLocationService: NSObject, CLLocationManagerDelegate {
         }
     }
 
-    private func withTimeout<T>(
+    private func requestLocationWithTimeout(timeoutMs: Int) async throws -> CLLocation {
-        timeoutMs: Int,
-        operation: @escaping () async throws -> T) async throws -> T
-    {
         if timeoutMs == 0 {
-            return try await operation()
+            return try await self.requestLocation()
         }
 
-        return try await withThrowingTaskGroup(of: T.self) { group in
+        let timeoutNs = UInt64(timeoutMs) * 1_000_000
-            group.addTask { try await operation() }
+        return try await withCheckedThrowingContinuation { continuation in
-            group.addTask {
+            let lock = NSLock()
-                try await Task.sleep(nanoseconds: UInt64(timeoutMs) * 1_000_000)
+            var didResume = false
-                throw Error.timeout
+
+            func resume(_ result: Result<CLLocation, Swift.Error>) {
+                lock.lock()
+                defer { lock.unlock() }
+                guard !didResume else { return }
+                didResume = true
+                continuation.resume(with: result)
+            }
+
+            let timeoutTask = Task {
+                try await Task.sleep(nanoseconds: timeoutNs)
+                resume(.failure(Error.timeout))
+            }
+
+            Task { @MainActor in
+                do {
+                    let location = try await self.requestLocation()
+                    timeoutTask.cancel()
+                    resume(.success(location))
+                } catch {
+                    timeoutTask.cancel()
+                    resume(.failure(error))
+                }
             }
-            let result = try await group.next()!
-            group.cancelAll()
-            return result
         }
     }
 
     private static func accuracyValue(_ accuracy: ClawdisLocationAccuracy) -> CLLocationAccuracy {
         switch accuracy {
         case .coarse:
-            return kCLLocationAccuracyKilometer
+            kCLLocationAccuracyKilometer
         case .balanced:
-            return kCLLocationAccuracyHundredMeters
+            kCLLocationAccuracyHundredMeters
         case .precise:
-            return kCLLocationAccuracyBest
+            kCLLocationAccuracyBest
         }
     }
 
@@ -107,3 +121,6 @@ final class MacNodeLocationService: NSObject, CLLocationManagerDelegate {
         cont.resume(throwing: error)
     }
 }
+
+@MainActor
+extension MacNodeLocationService: @preconcurrency CLLocationManagerDelegate {}

apps/macos/Sources/Clawdis/NodeMode/MacNodeRuntime.swift

@@ -104,7 +104,7 @@ actor MacNodeRuntime {
                 }
                 let params = (try? Self.decodeParams(ClawdisCameraSnapParams.self, from: req.paramsJSON)) ??
                     ClawdisCameraSnapParams()
-                let delayMs = min(10_000, max(0, params.delayMs ?? 2000))
+                let delayMs = min(10000, max(0, params.delayMs ?? 2000))
                 let res = try await self.cameraCapture.snap(
                     facing: CameraFacing(rawValue: params.facing?.rawValue ?? "") ?? .front,
                     maxWidth: params.maxWidth,
@@ -184,7 +184,7 @@ actor MacNodeRuntime {
                 let desired = params.desiredAccuracy ??
                     (Self.locationPreciseEnabled() ? .precise : .balanced)
                 let status = await self.locationService.authorizationStatus()
-                if status != .authorizedAlways && status != .authorizedWhenInUse {
+                if status != .authorizedAlways, status != .authorized {
                     return BridgeInvokeResponse(
                         id: req.id,
                         ok: false,

apps/macos/Sources/Clawdis/NodePairingApprovalPrompter.swift

@@ -611,7 +611,7 @@ final class NodePairingApprovalPrompter {
     private func updatePendingCounts() {
         // Keep a cheap observable summary for the menu bar status line.
         self.pendingCount = self.queue.count
-        self.pendingRepairCount = self.queue.filter { $0.isRepair == true }.count
+        self.pendingRepairCount = self.queue.count(where: { $0.isRepair == true })
     }
 
     private func reconcileOnce(timeoutMs: Double) async {

apps/macos/Sources/Clawdis/NodesMenu.swift

@@ -110,8 +110,8 @@ struct NodeMenuEntryFormatter {
         guard !trimmed.isEmpty else { return trimmed }
         if let range = trimmed.range(
             of: #"\s*\([^)]*\d[^)]*\)$"#,
-            options: .regularExpression
+            options: .regularExpression)
-        ) {
+        {
             return String(trimmed[..<range.lowerBound])
         }
         return trimmed
@@ -227,7 +227,6 @@ struct NodeMenuRowView: View {
                 .frame(maxWidth: .infinity, alignment: .leading)
             }
             .frame(maxWidth: .infinity, alignment: .leading)
-
         }
         .padding(.vertical, 8)
         .padding(.leading, 18)

apps/macos/Sources/Clawdis/Onboarding.swift

@@ -139,6 +139,7 @@ struct OnboardingView: View {
     var isWizardBlocking: Bool {
         self.activePageIndex == self.wizardPageIndex && !self.onboardingWizard.isComplete
     }
+
     var canAdvance: Bool { !self.isWizardBlocking }
     var devLinkCommand: String {
         let bundlePath = Bundle.main.bundlePath

apps/macos/Sources/Clawdis/OnboardingView+Layout.swift

@@ -86,7 +86,7 @@ extension OnboardingView {
 
     var navigationBar: some View {
         let wizardLockIndex = self.wizardPageOrderIndex
-        HStack(spacing: 20) {
+        return HStack(spacing: 20) {
             ZStack(alignment: .leading) {
                 Button(action: {}, label: {
                     Label("Back", systemImage: "chevron.left").labelStyle(.iconOnly)
@@ -112,7 +112,8 @@ extension OnboardingView {
 
             HStack(spacing: 8) {
                 ForEach(0..<self.pageCount, id: \.self) { index in
-                    let isLocked = wizardLockIndex != nil && !self.onboardingWizard.isComplete && index > (wizardLockIndex ?? 0)
+                    let isLocked = wizardLockIndex != nil && !self.onboardingWizard
+                        .isComplete && index > (wizardLockIndex ?? 0)
                     Button {
                         withAnimation { self.currentPage = index }
                     } label: {

apps/macos/Sources/Clawdis/OnboardingView+Pages.swift

@@ -444,7 +444,7 @@ extension OnboardingView {
     }
 
     func permissionsPage() -> some View {
-        return self.onboardingPage {
+        self.onboardingPage {
             Text("Grant permissions")
                 .font(.largeTitle.weight(.semibold))
             Text("These macOS permissions let Clawdis automate apps and capture context on this Mac.")

apps/macos/Sources/Clawdis/OnboardingView+Wizard.swift

@@ -1,3 +1,4 @@
+import ClawdisProtocol
 import Observation
 import SwiftUI
 
@@ -44,15 +45,15 @@ private struct OnboardingWizardCardContent: View {
 
     private var state: CardState {
         if let error = wizard.errorMessage { return .error(error) }
-        if wizard.isStarting { return .starting }
+        if self.wizard.isStarting { return .starting }
         if let step = wizard.currentStep { return .step(step) }
-        if wizard.isComplete { return .complete }
+        if self.wizard.isComplete { return .complete }
         return .waiting
     }
 
     var body: some View {
-        switch state {
+        switch self.state {
-        case .error(let error):
+        case let .error(error):
             Text("Wizard error")
                 .font(.headline)
             Text(error)
@@ -60,11 +61,11 @@ private struct OnboardingWizardCardContent: View {
                 .foregroundStyle(.secondary)
                 .fixedSize(horizontal: false, vertical: true)
             Button("Retry") {
-                wizard.reset()
+                self.wizard.reset()
                 Task {
-                    await wizard.startIfNeeded(
+                    await self.wizard.startIfNeeded(
-                        mode: mode,
+                        mode: self.mode,
-                        workspace: workspacePath.isEmpty ? nil : workspacePath)
+                        workspace: self.workspacePath.isEmpty ? nil : self.workspacePath)
                 }
             }
             .buttonStyle(.borderedProminent)
@@ -74,12 +75,12 @@ private struct OnboardingWizardCardContent: View {
                 Text("Starting wizard…")
                     .foregroundStyle(.secondary)
             }
-        case .step(let step):
+        case let .step(step):
             OnboardingWizardStepView(
                 step: step,
-                isSubmitting: wizard.isSubmitting)
+                isSubmitting: self.wizard.isSubmitting)
             { value in
-                Task { await wizard.submit(step: step, value: value) }
+                Task { await self.wizard.submit(step: step, value: value) }
             }
             .id(step.id)
         case .complete:

apps/macos/Sources/Clawdis/OnboardingView+Workspace.swift

@@ -101,7 +101,7 @@ extension OnboardingView {
         do {
             try await ConfigStore.save(root)
             return (true, nil)
-        } catch let error {
+        } catch {
             let errorMessage = "Failed to save config: \(error.localizedDescription)"
             return (false, errorMessage)
         }

apps/macos/Sources/Clawdis/OnboardingWizard.swift

@@ -4,6 +4,8 @@ import Observation
 import OSLog
 import SwiftUI
 
+private typealias ProtocolAnyCodable = ClawdisProtocol.AnyCodable
+
 private let onboardingWizardLogger = Logger(subsystem: "com.clawdis", category: "onboarding.wizard")
 
 @MainActor
@@ -43,7 +45,7 @@ final class OnboardingWizardModel {
             let res: WizardStartResult = try await GatewayConnection.shared.requestDecoded(
                 method: .wizardStart,
                 params: params)
-            applyStartResult(res)
+            self.applyStartResult(res)
         } catch {
             self.status = "error"
             self.errorMessage = error.localizedDescription
@@ -67,7 +69,7 @@ final class OnboardingWizardModel {
             let res: WizardNextResult = try await GatewayConnection.shared.requestDecoded(
                 method: .wizardNext,
                 params: params)
-            applyNextResult(res)
+            self.applyNextResult(res)
         } catch {
             self.status = "error"
             self.errorMessage = error.localizedDescription
@@ -81,7 +83,7 @@ final class OnboardingWizardModel {
             let res: WizardStatusResult = try await GatewayConnection.shared.requestDecoded(
                 method: .wizardCancel,
                 params: ["sessionId": AnyCodable(sessionId)])
-            applyStatusResult(res)
+            self.applyStatusResult(res)
         } catch {
             self.status = "error"
             self.errorMessage = error.localizedDescription
@@ -103,7 +105,8 @@ final class OnboardingWizardModel {
         self.currentStep = decodeWizardStep(res.step)
         if res.done { self.currentStep = nil }
         if res.done || anyCodableStringValue(res.status) == "done" || anyCodableStringValue(res.status) == "cancelled"
-            || anyCodableStringValue(res.status) == "error" {
+            || anyCodableStringValue(res.status) == "error"
+        {
             self.sessionId = nil
         }
     }
@@ -142,8 +145,7 @@ struct OnboardingWizardStepView: View {
         let initialMulti = Set(
             options.filter { option in
                 anyCodableArray(step.initialvalue).contains { anyCodableEqual($0, option.option.value) }
-            }.map { $0.index }
+            }.map(\.index))
-        )
 
         _textValue = State(initialValue: initialText)
         _confirmValue = State(initialValue: initialConfirm)
@@ -164,18 +166,18 @@ struct OnboardingWizardStepView: View {
                     .fixedSize(horizontal: false, vertical: true)
             }
 
-            switch wizardStepType(step) {
+            switch wizardStepType(self.step) {
             case "note":
                 EmptyView()
             case "text":
-                textField
+                self.textField
             case "confirm":
-                Toggle("", isOn: $confirmValue)
+                Toggle("", isOn: self.$confirmValue)
                     .toggleStyle(.switch)
             case "select":
-                selectOptions
+                self.selectOptions
             case "multiselect":
-                multiselectOptions
+                self.multiselectOptions
             case "progress":
                 ProgressView()
                     .controlSize(.small)
@@ -186,25 +188,25 @@ struct OnboardingWizardStepView: View {
                     .foregroundStyle(.secondary)
             }
 
-            Button(action: submit) {
+            Button(action: self.submit) {
-                Text(wizardStepType(step) == "action" ? "Run" : "Continue")
+                Text(wizardStepType(self.step) == "action" ? "Run" : "Continue")
                     .frame(minWidth: 120)
             }
             .buttonStyle(.borderedProminent)
-            .disabled(isSubmitting || isBlocked)
+            .disabled(self.isSubmitting || self.isBlocked)
         }
         .frame(maxWidth: .infinity, alignment: .leading)
     }
 
     @ViewBuilder
     private var textField: some View {
-        let isSensitive = step.sensitive == true
+        let isSensitive = self.step.sensitive == true
         if isSensitive {
-            SecureField(step.placeholder ?? "", text: $textValue)
+            SecureField(self.step.placeholder ?? "", text: self.$textValue)
                 .textFieldStyle(.roundedBorder)
                 .frame(maxWidth: 360)
         } else {
-            TextField(step.placeholder ?? "", text: $textValue)
+            TextField(self.step.placeholder ?? "", text: self.$textValue)
                 .textFieldStyle(.roundedBorder)
                 .frame(maxWidth: 360)
         }
@@ -212,33 +214,21 @@ struct OnboardingWizardStepView: View {
 
     private var selectOptions: some View {
         VStack(alignment: .leading, spacing: 8) {
-            ForEach(optionItems) { item in
+            ForEach(self.optionItems) { item in
-                Button {
+                WizardOptionRow(
-                    selectedIndex = item.index
+                    item: item,
-                } label: {
+                    isSelected: self.selectedIndex == item.index,
-                    HStack(alignment: .top, spacing: 8) {
+                    onSelect: {
-                        Image(systemName: selectedIndex == item.index ? "largecircle.fill.circle" : "circle")
+                        self.selectedIndex = item.index
-                            .foregroundStyle(.accent)
+                    })
-                        VStack(alignment: .leading, spacing: 2) {
-                            Text(item.option.label)
-                                .foregroundStyle(.primary)
-                            if let hint = item.option.hint, !hint.isEmpty {
-                                Text(hint)
-                                    .font(.caption)
-                                    .foregroundStyle(.secondary)
-                            }
-                        }
-                    }
-                }
-                .buttonStyle(.plain)
             }
         }
     }
 
     private var multiselectOptions: some View {
         VStack(alignment: .leading, spacing: 8) {
-            ForEach(optionItems) { item in
+            ForEach(self.optionItems) { item in
-                Toggle(isOn: bindingForOption(item)) {
+                Toggle(isOn: self.bindingForOption(item)) {
                     VStack(alignment: .leading, spacing: 2) {
                         Text(item.option.label)
                         if let hint = item.option.hint, !hint.isEmpty {
@@ -254,65 +244,97 @@ struct OnboardingWizardStepView: View {
 
     private func bindingForOption(_ item: WizardOptionItem) -> Binding<Bool> {
         Binding(get: {
-            selectedIndices.contains(item.index)
+            self.selectedIndices.contains(item.index)
         }, set: { newValue in
             if newValue {
-                selectedIndices.insert(item.index)
+                self.selectedIndices.insert(item.index)
             } else {
-                selectedIndices.remove(item.index)
+                self.selectedIndices.remove(item.index)
             }
         })
     }
 
     private var isBlocked: Bool {
         let type = wizardStepType(step)
-        if type == "select" { return optionItems.isEmpty }
+        if type == "select" { return self.optionItems.isEmpty }
-        if type == "multiselect" { return optionItems.isEmpty }
+        if type == "multiselect" { return self.optionItems.isEmpty }
         return false
     }
 
     private func submit() {
-        switch wizardStepType(step) {
+        switch wizardStepType(self.step) {
         case "note", "progress":
-            onSubmit(nil)
+            self.onSubmit(nil)
         case "text":
-            onSubmit(AnyCodable(textValue))
+            self.onSubmit(AnyCodable(self.textValue))
         case "confirm":
-            onSubmit(AnyCodable(confirmValue))
+            self.onSubmit(AnyCodable(self.confirmValue))
         case "select":
-            guard optionItems.indices.contains(selectedIndex) else {
+            guard self.optionItems.indices.contains(self.selectedIndex) else {
-                onSubmit(nil)
+                self.onSubmit(nil)
                 return
             }
-            let option = optionItems[selectedIndex].option
+            let option = self.optionItems[self.selectedIndex].option
-            onSubmit(option.value ?? AnyCodable(option.label))
+            self.onSubmit(self.gatewayValue(option.value, fallback: option.label))
         case "multiselect":
-            let values = optionItems
+            let values = self.optionItems
-                .filter { selectedIndices.contains($0.index) }
+                .filter { self.selectedIndices.contains($0.index) }
-                .map { $0.option.value ?? AnyCodable($0.option.label) }
+                .map { self.gatewayValue($0.option.value, fallback: $0.option.label) }
-            onSubmit(AnyCodable(values))
+            self.onSubmit(AnyCodable(values))
         case "action":
-            onSubmit(AnyCodable(true))
+            self.onSubmit(AnyCodable(true))
         default:
-            onSubmit(nil)
+            self.onSubmit(nil)
         }
     }
+
+    private func gatewayValue(_ value: ProtocolAnyCodable?, fallback: String) -> AnyCodable {
+        if let value {
+            return AnyCodable(value.value)
+        }
+        return AnyCodable(fallback)
+    }
 }
 
 private struct WizardOptionItem: Identifiable {
     let index: Int
     let option: WizardOption
 
-    var id: Int { index }
+    var id: Int { self.index }
+}
+
+private struct WizardOptionRow: View {
+    let item: WizardOptionItem
+    let isSelected: Bool
+    let onSelect: () -> Void
+
+    var body: some View {
+        Button(action: self.onSelect) {
+            HStack(alignment: .top, spacing: 8) {
+                Image(systemName: self.isSelected ? "largecircle.fill.circle" : "circle")
+                    .foregroundStyle(Color.accentColor)
+                VStack(alignment: .leading, spacing: 2) {
+                    Text(self.item.option.label)
+                        .foregroundStyle(.primary)
+                    if let hint = self.item.option.hint, !hint.isEmpty {
+                        Text(hint)
+                            .font(.caption)
+                            .foregroundStyle(.secondary)
+                    }
+                }
+            }
+        }
+        .buttonStyle(.plain)
+    }
 }
 
 private struct WizardOption {
-    let value: AnyCodable?
+    let value: ProtocolAnyCodable?
     let label: String
     let hint: String?
 }
 
-private func decodeWizardStep(_ raw: [String: AnyCodable]?) -> WizardStep? {
+private func decodeWizardStep(_ raw: [String: ProtocolAnyCodable]?) -> WizardStep? {
     guard let raw else { return nil }
     do {
         let data = try JSONEncoder().encode(raw)
@@ -323,7 +345,7 @@ private func decodeWizardStep(_ raw: [String: AnyCodable]?) -> WizardStep? {
     }
 }
 
-private func parseWizardOptions(_ raw: [[String: AnyCodable]]?) -> [WizardOption] {
+private func parseWizardOptions(_ raw: [[String: ProtocolAnyCodable]]?) -> [WizardOption] {
     guard let raw else { return [] }
     return raw.map { entry in
         let value = entry["value"]
@@ -337,66 +359,66 @@ private func wizardStepType(_ step: WizardStep) -> String {
     (step.type.value as? String) ?? ""
 }
 
-private func anyCodableString(_ value: AnyCodable?) -> String {
+private func anyCodableString(_ value: ProtocolAnyCodable?) -> String {
     switch value?.value {
     case let string as String:
-        return string
+        string
     case let int as Int:
-        return String(int)
+        String(int)
     case let double as Double:
-        return String(double)
+        String(double)
     case let bool as Bool:
-        return bool ? "true" : "false"
+        bool ? "true" : "false"
     default:
-        return ""
+        ""
     }
 }
 
-private func anyCodableStringValue(_ value: AnyCodable?) -> String? {
+private func anyCodableStringValue(_ value: ProtocolAnyCodable?) -> String? {
     value?.value as? String
 }
 
-private func anyCodableBool(_ value: AnyCodable?) -> Bool {
+private func anyCodableBool(_ value: ProtocolAnyCodable?) -> Bool {
     switch value?.value {
     case let bool as Bool:
-        return bool
+        bool
     case let string as String:
-        return string.lowercased() == "true"
+        string.lowercased() == "true"
     default:
-        return false
+        false
     }
 }
 
-private func anyCodableArray(_ value: AnyCodable?) -> [AnyCodable] {
+private func anyCodableArray(_ value: ProtocolAnyCodable?) -> [ProtocolAnyCodable] {
     switch value?.value {
-    case let arr as [AnyCodable]:
+    case let arr as [ProtocolAnyCodable]:
-        return arr
+        arr
     case let arr as [Any]:
-        return arr.map { AnyCodable($0) }
+        arr.map { ProtocolAnyCodable($0) }
     default:
-        return []
+        []
     }
 }
 
-private func anyCodableEqual(_ lhs: AnyCodable?, _ rhs: AnyCodable?) -> Bool {
+private func anyCodableEqual(_ lhs: ProtocolAnyCodable?, _ rhs: ProtocolAnyCodable?) -> Bool {
     switch (lhs?.value, rhs?.value) {
     case let (l as String, r as String):
-        return l == r
+        l == r
     case let (l as Int, r as Int):
-        return l == r
+        l == r
     case let (l as Double, r as Double):
-        return l == r
+        l == r
     case let (l as Bool, r as Bool):
-        return l == r
+        l == r
     case let (l as String, r as Int):
-        return l == String(r)
+        l == String(r)
     case let (l as Int, r as String):
-        return String(l) == r
+        String(l) == r
     case let (l as String, r as Double):
-        return l == String(r)
+        l == String(r)
     case let (l as Double, r as String):
-        return String(l) == r
+        String(l) == r
     default:
-        return false
+        false
     }
 }

apps/macos/Sources/Clawdis/PeekabooBridgeHostCoordinator.swift

@@ -1,9 +1,9 @@
 import Foundation
-import Security
 import os
 import PeekabooAutomationKit
 import PeekabooBridge
 import PeekabooFoundation
+import Security
 
 @MainActor
 final class PeekabooBridgeHostCoordinator {
@@ -80,7 +80,7 @@ final class PeekabooBridgeHostCoordinator {
             staticCode,
             SecCSFlags(rawValue: kSecCSSigningInformation),
             &infoCF) == errSecSuccess,
-              let info = infoCF as? [String: Any]
+            let info = infoCF as? [String: Any]
         else {
             return nil
         }

apps/macos/Sources/Clawdis/PermissionManager.swift

@@ -140,12 +140,12 @@ enum PermissionManager {
     private static func ensureLocation(interactive: Bool) async -> Bool {
         let status = CLLocationManager.authorizationStatus()
         switch status {
-        case .authorizedAlways, .authorizedWhenInUse:
+        case .authorizedAlways, .authorized:
             return true
         case .notDetermined:
             guard interactive else { return false }
             let updated = await LocationPermissionRequester.shared.request(always: false)
-            return updated == .authorizedAlways || updated == .authorizedWhenInUse
+            return updated == .authorizedAlways || updated == .authorized
         case .denied, .restricted:
             if interactive {
                 LocationPermissionHelper.openSettings()
@@ -198,9 +198,10 @@ enum PermissionManager {
 
             case .camera:
                 results[cap] = AVCaptureDevice.authorizationStatus(for: .video) == .authorized
+
             case .location:
                 let status = CLLocationManager.authorizationStatus()
-                results[cap] = status == .authorizedAlways || status == .authorizedWhenInUse
+                results[cap] = status == .authorizedAlways || status == .authorized
             }
         }
         return results
@@ -268,7 +269,7 @@ enum LocationPermissionHelper {
 }
 
 @MainActor
-final class LocationPermissionRequester: NSObject, CLLocationManagerDelegate {
+final class LocationPermissionRequester: NSObject {
     static let shared = LocationPermissionRequester()
     private let manager = CLLocationManager()
     private var continuation: CheckedContinuation<CLAuthorizationStatus, Never>?
@@ -296,6 +297,9 @@ final class LocationPermissionRequester: NSObject, CLLocationManagerDelegate {
     }
 }
 
+@MainActor
+extension LocationPermissionRequester: @preconcurrency CLLocationManagerDelegate {}
+
 enum AppleScriptPermission {
     private static let logger = Logger(subsystem: "com.clawdis", category: "AppleScriptPermission")
 

apps/macos/Sources/Clawdis/SessionMenuPreviewView.swift

@@ -174,12 +174,13 @@ struct SessionMenuPreviewView: View {
             let timeoutMs = Int(Self.previewTimeoutSeconds * 1000)
             let payload = try await AsyncTimeout.withTimeout(
                 seconds: Self.previewTimeoutSeconds,
-                onTimeout: { PreviewTimeoutError() }) {
+                onTimeout: { PreviewTimeoutError() })
-                    try await GatewayConnection.shared.chatHistory(
+            {
-                        sessionKey: self.sessionKey,
+                try await GatewayConnection.shared.chatHistory(
-                        limit: self.previewLimit,
+                    sessionKey: self.sessionKey,
-                        timeoutMs: timeoutMs)
+                    limit: self.previewLimit,
-                }
+                    timeoutMs: timeoutMs)
+            }
             let built = Self.previewItems(from: payload, maxItems: self.maxItems)
             await SessionPreviewCache.shared.store(items: built, for: self.sessionKey)
             await MainActor.run {
@@ -198,7 +199,9 @@ struct SessionMenuPreviewView: View {
                     self.status = .error("Preview unavailable")
                 }
             }
-            Self.logger.warning("Session preview failed session=\(self.sessionKey, privacy: .public) error=\(String(describing: error), privacy: .public)")
+            Self.logger
+                .warning(
+                    "Session preview failed session=\(self.sessionKey, privacy: .public) error=\(String(describing: error), privacy: .public)")
         }
     }
 

apps/macos/Sources/Clawdis/TailscaleIntegrationSection.swift

@@ -285,8 +285,7 @@ struct TailscaleIntegrationSection: View {
             requireCredentialsForServe: self.requireCredentialsForServe,
             password: trimmedPassword,
             connectionMode: self.connectionMode,
-            isPaused: self.isPaused
+            isPaused: self.isPaused)
-        )
 
         if !success, let errorMessage {
             self.statusMessage = errorMessage
@@ -307,8 +306,8 @@ struct TailscaleIntegrationSection: View {
         requireCredentialsForServe: Bool,
         password: String,
         connectionMode: AppState.ConnectionMode,
-        isPaused: Bool
+        isPaused: Bool) async -> (Bool, String?)
-    ) async -> (Bool, String?) {
+    {
         var root = await ConfigStore.load()
         var gateway = root["gateway"] as? [String: Any] ?? [:]
         var tailscale = gateway["tailscale"] as? [String: Any] ?? [:]
@@ -349,7 +348,7 @@ struct TailscaleIntegrationSection: View {
         do {
             try await ConfigStore.save(root)
             return (true, nil)
-        } catch let error {
+        } catch {
             return (false, error.localizedDescription)
         }
     }

apps/macos/Sources/Clawdis/TalkOverlayView.swift

@@ -35,14 +35,14 @@ struct TalkOverlayView: View {
                             .frame(width: 18, height: 18)
                             .background(Color.black.opacity(0.4))
                             .clipShape(Circle())
+                    }
+                    .buttonStyle(.plain)
+                    .contentShape(Circle())
+                    .offset(x: -2, y: -2)
+                    .opacity(self.hoveringWindow ? 1 : 0)
+                    .animation(.easeOut(duration: 0.12), value: self.hoveringWindow)
                 }
-                .buttonStyle(.plain)
+                .onHover { self.hoveringWindow = $0 }
-                .contentShape(Circle())
-                .offset(x: -2, y: -2)
-                .opacity(self.hoveringWindow ? 1 : 0)
-                .animation(.easeOut(duration: 0.12), value: self.hoveringWindow)
-            }
-            .onHover { self.hoveringWindow = $0 }
         }
         .frame(
             width: TalkOverlayController.overlaySize,
@@ -124,7 +124,7 @@ private final class OrbInteractionNSView: NSView {
     }
 
     override func mouseUp(with event: NSEvent) {
-        if !self.didDrag && !self.suppressSingleClick {
+        if !self.didDrag, !self.suppressSingleClick {
             self.onSingleClick?()
         }
         self.mouseDownEvent = nil
@@ -148,8 +148,8 @@ private struct TalkOrbView: View {
         } else {
             TimelineView(.animation) { context in
                 let t = context.date.timeIntervalSinceReferenceDate
-                let listenScale = phase == .listening ? (1 + CGFloat(self.level) * 0.12) : 1
+                let listenScale = self.phase == .listening ? (1 + CGFloat(self.level) * 0.12) : 1
-                let pulse = phase == .speaking ? (1 + 0.06 * sin(t * 6)) : 1
+                let pulse = self.phase == .speaking ? (1 + 0.06 * sin(t * 6)) : 1
 
                 ZStack {
                     Circle()
@@ -158,9 +158,9 @@ private struct TalkOrbView: View {
                         .shadow(color: Color.black.opacity(0.22), radius: 10, x: 0, y: 5)
                         .scaleEffect(pulse * listenScale)
 
-                    TalkWaveRings(phase: phase, level: level, time: t, accent: self.accent)
+                    TalkWaveRings(phase: self.phase, level: self.level, time: t, accent: self.accent)
 
-                    if phase == .thinking {
+                    if self.phase == .thinking {
                         TalkOrbitArcs(time: t)
                     }
                 }
@@ -186,11 +186,12 @@ private struct TalkWaveRings: View {
     var body: some View {
         ZStack {
             ForEach(0..<3, id: \.self) { idx in
-                let speed = phase == .speaking ? 1.4 : phase == .listening ? 0.9 : 0.6
+                let speed = self.phase == .speaking ? 1.4 : self.phase == .listening ? 0.9 : 0.6
                 let progress = (time * speed + Double(idx) * 0.28).truncatingRemainder(dividingBy: 1)
-                let amplitude = phase == .speaking ? 0.95 : phase == .listening ? 0.5 + level * 0.7 : 0.35
+                let amplitude = self.phase == .speaking ? 0.95 : self.phase == .listening ? 0.5 + self
-                let scale = 0.75 + progress * amplitude + (phase == .listening ? level * 0.15 : 0)
+                    .level * 0.7 : 0.35
-                let alpha = phase == .speaking ? 0.72 : phase == .listening ? 0.58 + level * 0.28 : 0.4
+                let scale = 0.75 + progress * amplitude + (self.phase == .listening ? self.level * 0.15 : 0)
+                let alpha = self.phase == .speaking ? 0.72 : self.phase == .listening ? 0.58 + self.level * 0.28 : 0.4
                 Circle()
                     .stroke(self.accent.opacity(alpha - progress * 0.3), lineWidth: 1.6)
                     .scaleEffect(scale)
@@ -208,11 +209,11 @@ private struct TalkOrbitArcs: View {
             Circle()
                 .trim(from: 0.08, to: 0.26)
                 .stroke(Color.white.opacity(0.88), style: StrokeStyle(lineWidth: 1.6, lineCap: .round))
-                .rotationEffect(.degrees(time * 42))
+                .rotationEffect(.degrees(self.time * 42))
             Circle()
                 .trim(from: 0.62, to: 0.86)
                 .stroke(Color.white.opacity(0.7), style: StrokeStyle(lineWidth: 1.4, lineCap: .round))
-                .rotationEffect(.degrees(-time * 35))
+                .rotationEffect(.degrees(-self.time * 35))
         }
         .scaleEffect(1.08)
     }

apps/macos/Sources/Clawdis/WorkActivityStore.swift

@@ -213,7 +213,7 @@ final class WorkActivityStore {
         meta: String?,
         args: [String: AnyCodable]?) -> String
     {
-        let wrappedArgs = wrapToolArgs(args)
+        let wrappedArgs = self.wrapToolArgs(args)
         let display = ToolDisplayRegistry.resolve(name: name ?? "tool", args: wrappedArgs, meta: meta)
         if let detail = display.detailLine, !detail.isEmpty {
             return "\(display.label): \(detail)"
@@ -223,22 +223,22 @@ final class WorkActivityStore {
 
     private static func wrapToolArgs(_ args: [String: AnyCodable]?) -> ClawdisKit.AnyCodable? {
         guard let args else { return nil }
-        let converted: [String: Any] = args.mapValues { unwrapJSONValue($0.value) }
+        let converted: [String: Any] = args.mapValues { self.unwrapJSONValue($0.value) }
         return ClawdisKit.AnyCodable(converted)
     }
 
     private static func unwrapJSONValue(_ value: Any) -> Any {
         if let dict = value as? [String: AnyCodable] {
-            return dict.mapValues { unwrapJSONValue($0.value) }
+            return dict.mapValues { self.unwrapJSONValue($0.value) }
         }
         if let array = value as? [AnyCodable] {
-            return array.map { unwrapJSONValue($0.value) }
+            return array.map { self.unwrapJSONValue($0.value) }
         }
         if let dict = value as? [String: Any] {
-            return dict.mapValues { unwrapJSONValue($0) }
+            return dict.mapValues { self.unwrapJSONValue($0) }
         }
         if let array = value as? [Any] {
-            return array.map { unwrapJSONValue($0) }
+            return array.map { self.unwrapJSONValue($0) }
         }
         return value
     }

apps/macos/Sources/ClawdisProtocol/GatewayModels.swift

@@ -826,7 +826,7 @@ public struct WizardStatusParams: Codable {
     }
 }
 
-public struct WizardStep: Codable {
+public struct WizardStep: Codable, Sendable {
     public let id: String
     public let type: AnyCodable
     public let title: String?
@@ -871,7 +871,7 @@ public struct WizardStep: Codable {
     }
 }
 
-public struct WizardNextResult: Codable {
+public struct WizardNextResult: Codable, Sendable {
     public let done: Bool
     public let step: [String: AnyCodable]?
     public let status: AnyCodable?
@@ -896,7 +896,7 @@ public struct WizardNextResult: Codable {
     }
 }
 
-public struct WizardStartResult: Codable {
+public struct WizardStartResult: Codable, Sendable {
     public let sessionid: String
     public let done: Bool
     public let step: [String: AnyCodable]?
@@ -925,7 +925,7 @@ public struct WizardStartResult: Codable {
     }
 }
 
-public struct WizardStatusResult: Codable {
+public struct WizardStatusResult: Codable, Sendable {
     public let status: AnyCodable
     public let error: String?