From 636e4d38d57a0502c8197e13114c7ec1140abf45 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Sat, 20 Dec 2025 12:56:57 +0100 Subject: [PATCH] style: tidy macos swift formatting --- apps/macos/Sources/Clawdis/DebugActions.swift | 1 + apps/macos/Sources/Clawdis/DeepLinks.swift | 7 +++-- .../Sources/Clawdis/DockIconManager.swift | 2 +- .../Clawdis/GatewayLaunchAgentManager.swift | 1 - .../Sources/Clawdis/MenuContentView.swift | 6 ++--- .../Clawdis/NodeMode/MacNodeRuntime.swift | 2 +- apps/macos/Sources/Clawdis/Onboarding.swift | 6 ++--- apps/macos/Sources/Clawdis/PortGuardian.swift | 26 +++++++++---------- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/apps/macos/Sources/Clawdis/DebugActions.swift b/apps/macos/Sources/Clawdis/DebugActions.swift index a87ddb6dd..7517ee653 100644 --- a/apps/macos/Sources/Clawdis/DebugActions.swift +++ b/apps/macos/Sources/Clawdis/DebugActions.swift @@ -100,6 +100,7 @@ enum DebugActions { // ControlChannel will surface a degraded state; also refresh health to update the menu text. Task { await HealthStore.shared.refresh(onDemand: true) } } + case .unconfigured: await GatewayConnection.shared.shutdown() await ControlChannel.shared.disconnect() diff --git a/apps/macos/Sources/Clawdis/DeepLinks.swift b/apps/macos/Sources/Clawdis/DeepLinks.swift index d237907fb..e8bc19c98 100644 --- a/apps/macos/Sources/Clawdis/DeepLinks.swift +++ b/apps/macos/Sources/Clawdis/DeepLinks.swift @@ -63,11 +63,10 @@ final class DeepLinkHandler { let explicitSessionKey = link.sessionKey? .trimmingCharacters(in: .whitespacesAndNewlines) .nonEmpty - let resolvedSessionKey: String - if let explicitSessionKey { - resolvedSessionKey = explicitSessionKey + let resolvedSessionKey: String = if let explicitSessionKey { + explicitSessionKey } else { - resolvedSessionKey = await GatewayConnection.shared.mainSessionKey() + await GatewayConnection.shared.mainSessionKey() } let invocation = GatewayAgentInvocation( message: messagePreview, diff --git a/apps/macos/Sources/Clawdis/DockIconManager.swift b/apps/macos/Sources/Clawdis/DockIconManager.swift index 32122969a..1e3a98f43 100644 --- a/apps/macos/Sources/Clawdis/DockIconManager.swift +++ b/apps/macos/Sources/Clawdis/DockIconManager.swift @@ -9,7 +9,7 @@ final class DockIconManager: NSObject, @unchecked Sendable { private var windowsObservation: NSKeyValueObservation? private let logger = Logger(subsystem: "com.steipete.clawdis", category: "DockIconManager") - private override init() { + override private init() { super.init() self.setupObservers() Task { @MainActor in diff --git a/apps/macos/Sources/Clawdis/GatewayLaunchAgentManager.swift b/apps/macos/Sources/Clawdis/GatewayLaunchAgentManager.swift index 160404b8f..585b88a0c 100644 --- a/apps/macos/Sources/Clawdis/GatewayLaunchAgentManager.swift +++ b/apps/macos/Sources/Clawdis/GatewayLaunchAgentManager.swift @@ -111,4 +111,3 @@ enum GatewayLaunchAgentManager { }.value } } - diff --git a/apps/macos/Sources/Clawdis/MenuContentView.swift b/apps/macos/Sources/Clawdis/MenuContentView.swift index e9cd41642..569a2afe3 100644 --- a/apps/macos/Sources/Clawdis/MenuContentView.swift +++ b/apps/macos/Sources/Clawdis/MenuContentView.swift @@ -111,11 +111,11 @@ struct MenuContent: View { private var connectionLabel: String { switch self.state.connectionMode { case .unconfigured: - return "Clawdis Not Configured" + "Clawdis Not Configured" case .remote: - return "Remote Clawdis Active" + "Remote Clawdis Active" case .local: - return "Clawdis Active" + "Clawdis Active" } } diff --git a/apps/macos/Sources/Clawdis/NodeMode/MacNodeRuntime.swift b/apps/macos/Sources/Clawdis/NodeMode/MacNodeRuntime.swift index 7af2f156a..621f9a6b2 100644 --- a/apps/macos/Sources/Clawdis/NodeMode/MacNodeRuntime.swift +++ b/apps/macos/Sources/Clawdis/NodeMode/MacNodeRuntime.swift @@ -323,7 +323,7 @@ actor MacNodeRuntime { let params = try Self.decodeParams(ClawdisSystemNotifyParams.self, from: req.paramsJSON) let title = params.title.trimmingCharacters(in: .whitespacesAndNewlines) let body = params.body.trimmingCharacters(in: .whitespacesAndNewlines) - if title.isEmpty && body.isEmpty { + if title.isEmpty, body.isEmpty { return Self.errorResponse(req, code: .invalidRequest, message: "INVALID_REQUEST: empty notification") } diff --git a/apps/macos/Sources/Clawdis/Onboarding.swift b/apps/macos/Sources/Clawdis/Onboarding.swift index f4a24bab3..b0b27ae8c 100644 --- a/apps/macos/Sources/Clawdis/Onboarding.swift +++ b/apps/macos/Sources/Clawdis/Onboarding.swift @@ -93,11 +93,11 @@ struct OnboardingView: View { case .remote: // Remote setup doesn't need local gateway/CLI/workspace setup pages, // and WhatsApp/Telegram setup is optional. - return [0, 1, 5, 9] + [0, 1, 5, 9] case .unconfigured: - return [0, 1, 9] + [0, 1, 9] case .local: - return [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] } } diff --git a/apps/macos/Sources/Clawdis/PortGuardian.swift b/apps/macos/Sources/Clawdis/PortGuardian.swift index 07f84658c..ecbaf8310 100644 --- a/apps/macos/Sources/Clawdis/PortGuardian.swift +++ b/apps/macos/Sources/Clawdis/PortGuardian.swift @@ -157,20 +157,20 @@ actor PortGuardian { let okPredicate: (Listener) -> Bool let expectedCommands = ["node", "clawdis", "tsx", "pnpm", "bun"] - switch mode { - case .remote: - expectedDesc = "SSH tunnel to remote gateway" - okPredicate = { $0.command.lowercased().contains("ssh") } - case .local: - expectedDesc = "Gateway websocket (node/tsx)" - okPredicate = { listener in - let c = listener.command.lowercased() - return expectedCommands.contains { c.contains($0) } + switch mode { + case .remote: + expectedDesc = "SSH tunnel to remote gateway" + okPredicate = { $0.command.lowercased().contains("ssh") } + case .local: + expectedDesc = "Gateway websocket (node/tsx)" + okPredicate = { listener in + let c = listener.command.lowercased() + return expectedCommands.contains { c.contains($0) } + } + case .unconfigured: + expectedDesc = "Gateway not configured" + okPredicate = { _ in false } } - case .unconfigured: - expectedDesc = "Gateway not configured" - okPredicate = { _ in false } - } if listeners.isEmpty { let text = "Nothing is listening on \(port) (\(expectedDesc))."