style(macos): swiftformat + swiftlint cleanup

apps/macos/Sources/Clawdbot/GatewayAgentChannel.swift

@@ -16,12 +16,11 @@ enum GatewayAgentChannel: String, CaseIterable, Sendable {
     func shouldDeliver(_ isLast: Bool) -> Bool {
         switch self {
         case .webchat:
-            return false
+            false
         case .last:
-            return isLast
+            isLast
         case .whatsapp, .telegram:
-            return true
+            true
         }
     }
 }
-

apps/macos/Sources/Clawdbot/GatewayDiscoveryModel.swift

@@ -208,9 +208,15 @@ final class GatewayDiscoveryModel {
         return merged
     }
 
-    static func parseGatewayTXT(_ txt: [String: String])
-        -> (lanHost: String?, tailnetDns: String?, sshPort: Int, gatewayPort: Int?, cliPath: String?)
-    {
+    struct GatewayTXT: Equatable {
+        var lanHost: String?
+        var tailnetDns: String?
+        var sshPort: Int
+        var gatewayPort: Int?
+        var cliPath: String?
+    }
+
+    static func parseGatewayTXT(_ txt: [String: String]) -> GatewayTXT {
         var lanHost: String?
         var tailnetDns: String?
         var sshPort = 22
@@ -242,7 +248,12 @@ final class GatewayDiscoveryModel {
             cliPath = trimmed.isEmpty ? nil : trimmed
         }
 
-        return (lanHost, tailnetDns, sshPort, gatewayPort, cliPath)
+        return GatewayTXT(
+            lanHost: lanHost,
+            tailnetDns: tailnetDns,
+            sshPort: sshPort,
+            gatewayPort: gatewayPort,
+            cliPath: cliPath)
     }
 
     static func buildSSHTarget(user: String, host: String, port: Int) -> String {

apps/macos/Sources/Clawdbot/GatewayLaunchAgentManager.swift

@@ -62,7 +62,11 @@ enum GatewayLaunchAgentManager {
             let desiredBind = self.preferredGatewayBind() ?? "loopback"
             let desiredToken = self.preferredGatewayToken()
             let desiredPassword = self.preferredGatewayPassword()
-            let desiredConfig = DesiredConfig(port: port, bind: desiredBind, token: desiredToken, password: desiredPassword)
+            let desiredConfig = DesiredConfig(
+                port: port,
+                bind: desiredBind,
+                token: desiredToken,
+                password: desiredPassword)
 
             // If launchd already loaded the job (common on login), avoid `bootout` unless we must
             // change the config. `bootout` can kill a just-started gateway and cause attach loops.

apps/macos/Sources/Clawdbot/Launchctl.swift

@@ -79,4 +79,3 @@ enum LaunchAgentPlist {
         return token.isEmpty ? nil : token
     }
 }
-

apps/macos/Sources/Clawdbot/MenuSessionsInjector.swift

@@ -267,7 +267,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         let rows = self.usageRows
         let errorText = self.cachedUsageErrorText
 
-        if rows.isEmpty && errorText == nil {
+        if rows.isEmpty, errorText == nil {
             return cursor
         }
 

apps/macos/Sources/Clawdbot/MenuUsageHeaderView.swift

@@ -42,4 +42,3 @@ struct MenuUsageHeaderView: View {
         return "\(self.count) providers"
     }
 }
-

apps/macos/Sources/Clawdbot/RemotePortTunnel.swift

@@ -41,8 +41,8 @@ final class RemotePortTunnel {
     static func create(
         remotePort: Int,
         preferredLocalPort: UInt16? = nil,
-        allowRemoteUrlOverride: Bool = true
-    ) async throws -> RemotePortTunnel {
+        allowRemoteUrlOverride: Bool = true) async throws -> RemotePortTunnel
+    {
         let settings = CommandResolver.connectionSettings()
         guard settings.mode == .remote, let parsed = CommandResolver.parseSSHTarget(settings.target) else {
             throw NSError(

apps/macos/Sources/Clawdbot/UsageData.swift

@@ -29,8 +29,8 @@ struct UsageRow: Identifiable {
     let error: String?
 
     var titleText: String {
-        if let plan, !plan.isEmpty { return "\(displayName) (\(plan))" }
-        return displayName
+        if let plan, !plan.isEmpty { return "\(self.displayName) (\(plan))" }
+        return self.displayName
     }
 
     var remainingPercent: Int? {
@@ -107,4 +107,3 @@ enum UsageLoader {
         return try JSONDecoder().decode(GatewayUsageSummary.self, from: data)
     }
 }
-

apps/macos/Sources/Clawdbot/UsageMenuLabelView.swift

@@ -21,7 +21,7 @@ struct UsageMenuLabelView: View {
             }
 
             HStack(alignment: .firstTextBaseline, spacing: 6) {
-                Text(row.titleText)
+                Text(self.row.titleText)
                     .font(.caption.weight(.semibold))
                     .foregroundStyle(self.primaryTextColor)
                     .lineLimit(1)
@@ -30,7 +30,7 @@ struct UsageMenuLabelView: View {
 
                 Spacer(minLength: 4)
 
-                Text(row.detailText())
+                Text(self.row.detailText())
                     .font(.caption.monospacedDigit())
                     .foregroundStyle(self.secondaryTextColor)
                     .lineLimit(1)
@@ -43,4 +43,3 @@ struct UsageMenuLabelView: View {
         .padding(.trailing, self.paddingTrailing)
     }
 }
-