From 719bfb46ff3f0383d11839723babfb7bda984ffd Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Sun, 22 Mar 2026 17:32:30 +0000 Subject: [PATCH] style: format macos sources for ci --- apps/macos/Sources/OpenClaw/AppState.swift | 4 +-- .../CanvasA2UIActionMessageHandler.swift | 4 +-- .../OpenClaw/CanvasWindowController.swift | 3 +-- .../OpenClaw/CronJobEditor+Helpers.swift | 9 ++++--- apps/macos/Sources/OpenClaw/CronModels.swift | 26 +++++++++---------- .../ExecApprovalsGatewayPrompter.swift | 14 +++++----- .../NodeMode/MacNodeBrowserProxy.swift | 4 ++- .../OpenClaw/OnboardingView+Pages.swift | 13 +++++----- .../Sources/OpenClaw/RemoteGatewayProbe.swift | 2 +- .../OpenClaw/TalkModeGatewayConfig.swift | 8 +++--- 10 files changed, 45 insertions(+), 42 deletions(-) diff --git a/apps/macos/Sources/OpenClaw/AppState.swift b/apps/macos/Sources/OpenClaw/AppState.swift index d503686ba57..77402d7796f 100644 --- a/apps/macos/Sources/OpenClaw/AppState.swift +++ b/apps/macos/Sources/OpenClaw/AppState.swift @@ -783,7 +783,7 @@ extension AppState { remoteToken: String, remoteTokenDirty: Bool) -> [String: Any] { - Self.updatedRemoteGatewayConfig( + self.updatedRemoteGatewayConfig( current: current, transport: transport, remoteUrl: remoteUrl, @@ -804,7 +804,7 @@ extension AppState { remoteToken: String, remoteTokenDirty: Bool) -> [String: Any] { - Self.syncedGatewayRoot( + self.syncedGatewayRoot( currentRoot: currentRoot, connectionMode: connectionMode, remoteTransport: remoteTransport, diff --git a/apps/macos/Sources/OpenClaw/CanvasA2UIActionMessageHandler.swift b/apps/macos/Sources/OpenClaw/CanvasA2UIActionMessageHandler.swift index 0599f4ab3a6..e1e75c51e82 100644 --- a/apps/macos/Sources/OpenClaw/CanvasA2UIActionMessageHandler.swift +++ b/apps/macos/Sources/OpenClaw/CanvasA2UIActionMessageHandler.swift @@ -8,8 +8,8 @@ final class CanvasA2UIActionMessageHandler: NSObject, WKScriptMessageHandler { static let messageName = "openclawCanvasA2UIAction" static let allMessageNames = [messageName] - // Compatibility helper for debug/test shims. Runtime dispatch remains - // limited to in-app canvas schemes in `didReceive`. + /// Compatibility helper for debug/test shims. Runtime dispatch remains + /// limited to in-app canvas schemes in `didReceive`. static func isLocalNetworkCanvasURL(_ url: URL) -> Bool { guard let scheme = url.scheme?.lowercased(), scheme == "http" || scheme == "https" else { return false diff --git a/apps/macos/Sources/OpenClaw/CanvasWindowController.swift b/apps/macos/Sources/OpenClaw/CanvasWindowController.swift index 0032bfff0fa..4169543c7d1 100644 --- a/apps/macos/Sources/OpenClaw/CanvasWindowController.swift +++ b/apps/macos/Sources/OpenClaw/CanvasWindowController.swift @@ -57,8 +57,7 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS let allowedSchemesJSON = ( try? String( data: JSONSerialization.data(withJSONObject: CanvasScheme.allSchemes), - encoding: .utf8) - ) ?? "[]" + encoding: .utf8)) ?? "[]" let bridgeScript = """ (() => { try { diff --git a/apps/macos/Sources/OpenClaw/CronJobEditor+Helpers.swift b/apps/macos/Sources/OpenClaw/CronJobEditor+Helpers.swift index 41b98111b4e..4c05bb29916 100644 --- a/apps/macos/Sources/OpenClaw/CronJobEditor+Helpers.swift +++ b/apps/macos/Sources/OpenClaw/CronJobEditor+Helpers.swift @@ -17,10 +17,10 @@ extension CronJobEditor { self.enabled = job.enabled self.deleteAfterRun = job.deleteAfterRun ?? false switch job.parsedSessionTarget { - case .predefined(let target): + case let .predefined(target): self.sessionTarget = target self.preservedSessionTargetRaw = nil - case .session(let id): + case let .session(id): self.sessionTarget = .isolated self.preservedSessionTargetRaw = "session:\(id)" } @@ -265,7 +265,10 @@ extension CronJobEditor { } var effectiveSessionTargetRaw: String { - if self.sessionTarget == .isolated, let preserved = self.preservedSessionTargetRaw?.trimmingCharacters(in: .whitespacesAndNewlines), !preserved.isEmpty { + if self.sessionTarget == .isolated, + let preserved = self.preservedSessionTargetRaw?.trimmingCharacters(in: .whitespacesAndNewlines), + !preserved.isEmpty + { return preserved } return self.sessionTarget.rawValue diff --git a/apps/macos/Sources/OpenClaw/CronModels.swift b/apps/macos/Sources/OpenClaw/CronModels.swift index 78016ff9f88..8c6191155e0 100644 --- a/apps/macos/Sources/OpenClaw/CronModels.swift +++ b/apps/macos/Sources/OpenClaw/CronModels.swift @@ -16,10 +16,10 @@ enum CronCustomSessionTarget: Codable, Equatable { var rawValue: String { switch self { - case .predefined(let target): - return target.rawValue - case .session(let id): - return "session:\(id)" + case let .predefined(target): + target.rawValue + case let .session(id): + "session:\(id)" } } @@ -328,10 +328,10 @@ struct CronJob: Identifiable, Codable, Equatable { /// predefined enum. var sessionTarget: CronSessionTarget { switch self.parsedSessionTarget { - case .predefined(let target): - return target + case let .predefined(target): + target case .session: - return .isolated + .isolated } } @@ -342,20 +342,20 @@ struct CronJob: Identifiable, Codable, Equatable { var transcriptSessionKey: String? { switch self.parsedSessionTarget { case .predefined(.main): - return nil + nil case .predefined(.isolated), .predefined(.current): - return "cron:\(self.id)" - case .session(let id): - return id + "cron:\(self.id)" + case let .session(id): + id } } var supportsAnnounceDelivery: Bool { switch self.parsedSessionTarget { case .predefined(.main): - return false + false case .predefined(.isolated), .predefined(.current), .session: - return true + true } } diff --git a/apps/macos/Sources/OpenClaw/ExecApprovalsGatewayPrompter.swift b/apps/macos/Sources/OpenClaw/ExecApprovalsGatewayPrompter.swift index 08e60b84d2b..c0737418bf0 100644 --- a/apps/macos/Sources/OpenClaw/ExecApprovalsGatewayPrompter.swift +++ b/apps/macos/Sources/OpenClaw/ExecApprovalsGatewayPrompter.swift @@ -89,11 +89,11 @@ final class ExecApprovalsGatewayPrompter { private static func shouldAsk(security: ExecSecurity, ask: ExecAsk) -> Bool { switch ask { case .always: - return true + true case .onMiss: - return security == .allowlist + security == .allowlist case .off: - return false + false } } @@ -113,21 +113,21 @@ final class ExecApprovalsGatewayPrompter { let mode = AppStateStore.shared.connectionMode let activeSession = WebChatManager.shared.activeSessionKey?.trimmingCharacters(in: .whitespacesAndNewlines) let requestSession = request.request.sessionKey?.trimmingCharacters(in: .whitespacesAndNewlines) - + // Read-only resolve to avoid disk writes on the MainActor let approvals = ExecApprovalsStore.resolveReadOnly(agentId: request.request.agentId) let security = approvals.agent.security let ask = approvals.agent.ask - + let shouldAsk = Self.shouldAsk(security: security, ask: ask) - + let canPresent = shouldAsk && Self.shouldPresent( mode: mode, activeSession: activeSession, requestSession: requestSession, lastInputSeconds: Self.lastInputSeconds(), thresholdSeconds: 120) - + return PresentationDecision( shouldAsk: shouldAsk, canPresent: canPresent, diff --git a/apps/macos/Sources/OpenClaw/NodeMode/MacNodeBrowserProxy.swift b/apps/macos/Sources/OpenClaw/NodeMode/MacNodeBrowserProxy.swift index 367907f9fb7..b43141a3139 100644 --- a/apps/macos/Sources/OpenClaw/NodeMode/MacNodeBrowserProxy.swift +++ b/apps/macos/Sources/OpenClaw/NodeMode/MacNodeBrowserProxy.swift @@ -147,7 +147,9 @@ actor MacNodeBrowserProxy { } if method != "GET", let body = params.body { - request.httpBody = try JSONSerialization.data(withJSONObject: body.foundationValue, options: [.fragmentsAllowed]) + request.httpBody = try JSONSerialization.data( + withJSONObject: body.foundationValue, + options: [.fragmentsAllowed]) request.setValue("application/json", forHTTPHeaderField: "Content-Type") } diff --git a/apps/macos/Sources/OpenClaw/OnboardingView+Pages.swift b/apps/macos/Sources/OpenClaw/OnboardingView+Pages.swift index f35e4e4c4ec..d1831d104fc 100644 --- a/apps/macos/Sources/OpenClaw/OnboardingView+Pages.swift +++ b/apps/macos/Sources/OpenClaw/OnboardingView+Pages.swift @@ -337,7 +337,6 @@ extension OnboardingView { self.remoteProbePreflightMessage == nil && self.remoteProbeState != .checking } - @ViewBuilder private func remoteConnectionSection() -> some View { VStack(alignment: .leading, spacing: 10) { HStack(alignment: .top, spacing: 12) { @@ -503,17 +502,17 @@ extension OnboardingView { { switch issue { case .tokenRequired: - return ("key.fill", .orange) + ("key.fill", .orange) case .tokenMismatch: - return ("exclamationmark.triangle.fill", .orange) + ("exclamationmark.triangle.fill", .orange) case .gatewayTokenNotConfigured: - return ("wrench.and.screwdriver.fill", .orange) + ("wrench.and.screwdriver.fill", .orange) case .setupCodeExpired: - return ("qrcode.viewfinder", .orange) + ("qrcode.viewfinder", .orange) case .passwordRequired: - return ("lock.slash.fill", .orange) + ("lock.slash.fill", .orange) case .pairingRequired: - return ("link.badge.plus", .orange) + ("link.badge.plus", .orange) } } diff --git a/apps/macos/Sources/OpenClaw/RemoteGatewayProbe.swift b/apps/macos/Sources/OpenClaw/RemoteGatewayProbe.swift index 7073ad81de7..bde65c03495 100644 --- a/apps/macos/Sources/OpenClaw/RemoteGatewayProbe.swift +++ b/apps/macos/Sources/OpenClaw/RemoteGatewayProbe.swift @@ -180,7 +180,7 @@ enum RemoteGatewayProbe { } do { - _ = try await GatewayConnection.shared.healthSnapshot(timeoutMs: 10_000) + _ = try await GatewayConnection.shared.healthSnapshot(timeoutMs: 10000) let authSource = await GatewayConnection.shared.authSource() return .ready(RemoteGatewayProbeSuccess(authSource: authSource)) } catch { diff --git a/apps/macos/Sources/OpenClaw/TalkModeGatewayConfig.swift b/apps/macos/Sources/OpenClaw/TalkModeGatewayConfig.swift index 15600b5ea0e..0f6026cd40e 100644 --- a/apps/macos/Sources/OpenClaw/TalkModeGatewayConfig.swift +++ b/apps/macos/Sources/OpenClaw/TalkModeGatewayConfig.swift @@ -23,8 +23,8 @@ enum TalkModeGatewayConfigParser { defaultSilenceTimeoutMs: Int, envVoice: String?, sagVoice: String?, - envApiKey: String? - ) -> TalkModeGatewayConfigState { + envApiKey: String?) -> TalkModeGatewayConfigState + { let talk = snapshot.config?["talk"]?.dictionaryValue let selection = TalkConfigParsing.selectProviderConfig(talk, defaultProvider: defaultProvider) let activeProvider = selection?.provider ?? defaultProvider @@ -81,8 +81,8 @@ enum TalkModeGatewayConfigParser { defaultSilenceTimeoutMs: Int, envVoice: String?, sagVoice: String?, - envApiKey: String? - ) -> TalkModeGatewayConfigState { + envApiKey: String?) -> TalkModeGatewayConfigState + { let resolvedVoice = (envVoice?.isEmpty == false ? envVoice : nil) ?? (sagVoice?.isEmpty == false ? sagVoice : nil)