let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: swiftformat sweep

Browse Source
This commit is contained in:
Peter Steinberger
2026-01-08 02:36:29 +00:00
parent 7f0f82e869
commit 1e1293cc0a
44 changed files with 85 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/macos/Sources/Clawdbot/RemotePortTunnel.swift
View File

@@ -55,8 +55,8 @@ final class RemotePortTunnel {
let sshHost = parsed.host.trimmingCharacters(in: .whitespacesAndNewlines)
let remotePortOverride =
allowRemoteUrlOverride && remotePort == GatewayEnvironment.gatewayPort()
? Self.resolveRemotePortOverride(for: sshHost)
: nil
? Self.resolveRemotePortOverride(for: sshHost)
: nil
let resolvedRemotePort = remotePortOverride ?? remotePort
if let override = remotePortOverride {
Self.logger.info(

2
apps/macos/Tests/ClawdbotIPCTests/AgentEventStoreTests.swift
View File

@@ -1,6 +1,6 @@
import ClawdbotProtocol
import Foundation
import Testing
import ClawdbotProtocol
@testable import Clawdbot
@Suite

1
apps/macos/Tests/ClawdbotIPCTests/AnthropicOAuthCodeStateTests.swift
View File

@@ -29,4 +29,3 @@ struct AnthropicOAuthCodeStateTests {
#expect(parsed == .init(code: "abcDEF1234", state: "stateXYZ9876"))
}
}

1
apps/macos/Tests/ClawdbotIPCTests/CameraCaptureServiceTests.swift
View File

@@ -19,4 +19,3 @@ import Testing
#expect(high.quality == 1.0)
}
}

1
apps/macos/Tests/ClawdbotIPCTests/CameraIPCTests.swift
View File

@@ -59,4 +59,3 @@ import Testing
}
}
}

6
apps/macos/Tests/ClawdbotIPCTests/CanvasWindowSmokeTests.swift
View File

@@ -8,7 +8,8 @@ import Testing
@MainActor
struct CanvasWindowSmokeTests {
@Test func panelControllerShowsAndHides() async throws {
let root = FileManager.default.temporaryDirectory.appendingPathComponent("clawdbot-canvas-test-\(UUID().uuidString)")
let root = FileManager.default.temporaryDirectory
.appendingPathComponent("clawdbot-canvas-test-\(UUID().uuidString)")
try FileManager.default.createDirectory(at: root, withIntermediateDirectories: true)
defer { try? FileManager.default.removeItem(at: root) }
@@ -30,7 +31,8 @@ struct CanvasWindowSmokeTests {
}
@Test func windowControllerShowsAndCloses() async throws {
let root = FileManager.default.temporaryDirectory.appendingPathComponent("clawdbot-canvas-test-\(UUID().uuidString)")
let root = FileManager.default.temporaryDirectory
.appendingPathComponent("clawdbot-canvas-test-\(UUID().uuidString)")
try FileManager.default.createDirectory(at: root, withIntermediateDirectories: true)
defer { try? FileManager.default.removeItem(at: root) }

12
apps/macos/Tests/ClawdbotIPCTests/ConfigStoreTests.swift
View File

@@ -10,8 +10,7 @@ struct ConfigStoreTests {
await ConfigStore._testSetOverrides(.init(
isRemoteMode: { true },
loadLocal: { localHit = true; return ["local": true] },
loadRemote: { remoteHit = true; return ["remote": true] }
))
loadRemote: { remoteHit = true; return ["remote": true] }))
let result = await ConfigStore.load()
@@ -27,8 +26,7 @@ struct ConfigStoreTests {
await ConfigStore._testSetOverrides(.init(
isRemoteMode: { false },
loadLocal: { localHit = true; return ["local": true] },
loadRemote: { remoteHit = true; return ["remote": true] }
))
loadRemote: { remoteHit = true; return ["remote": true] }))
let result = await ConfigStore.load()
@@ -44,8 +42,7 @@ struct ConfigStoreTests {
await ConfigStore._testSetOverrides(.init(
isRemoteMode: { true },
saveLocal: { _ in localHit = true },
saveRemote: { _ in remoteHit = true }
))
saveRemote: { _ in remoteHit = true }))
try await ConfigStore.save(["remote": true])
@@ -60,8 +57,7 @@ struct ConfigStoreTests {
await ConfigStore._testSetOverrides(.init(
isRemoteMode: { false },
saveLocal: { _ in localHit = true },
saveRemote: { _ in remoteHit = true }
))
saveRemote: { _ in remoteHit = true }))
try await ConfigStore.save(["local": true])

2
apps/macos/Tests/ClawdbotIPCTests/CronModelsTests.swift
View File

@@ -12,7 +12,7 @@ struct CronModelsTests {
}
@Test func scheduleEveryEncodesAndDecodesWithAnchor() throws {
let schedule = CronSchedule.every(everyMs: 5_000, anchorMs: 10_000)
let schedule = CronSchedule.every(everyMs: 5000, anchorMs: 10000)
let data = try JSONEncoder().encode(schedule)
let decoded = try JSONDecoder().decode(CronSchedule.self, from: data)
#expect(decoded == schedule)

6
apps/macos/Tests/ClawdbotIPCTests/DeviceModelCatalogTests.swift
View File

@@ -5,8 +5,10 @@ import Testing
struct DeviceModelCatalogTests {
@Test
func symbolPrefersModelIdentifierPrefixes() {
#expect(DeviceModelCatalog.symbol(deviceFamily: "iPad", modelIdentifier: "iPad16,6", friendlyName: nil) == "ipad")
#expect(DeviceModelCatalog.symbol(deviceFamily: "iPhone", modelIdentifier: "iPhone17,3", friendlyName: nil) == "iphone")
#expect(DeviceModelCatalog
.symbol(deviceFamily: "iPad", modelIdentifier: "iPad16,6", friendlyName: nil) == "ipad")
#expect(DeviceModelCatalog
.symbol(deviceFamily: "iPhone", modelIdentifier: "iPhone17,3", friendlyName: nil) == "iphone")
}
@Test

1
apps/macos/Tests/ClawdbotIPCTests/GatewayAgentChannelTests.swift
View File

@@ -21,4 +21,3 @@ import Testing
#expect(GatewayAgentChannel(raw: "unknown") == .last)
}
}

1
apps/macos/Tests/ClawdbotIPCTests/GatewayAutostartPolicyTests.swift
View File

@@ -29,4 +29,3 @@ struct GatewayAutostartPolicyTests {
attachExistingOnly: false))
}
}

4
apps/macos/Tests/ClawdbotIPCTests/GatewayDiscoveryModelTests.swift
View File

@@ -70,7 +70,7 @@ struct GatewayDiscoveryModelTests {
"tailnetDns": " peters-mac-studio-1.ts.net ",
"sshPort": " 2222 ",
"gatewayPort": " 18799 ",
"cliPath": " /opt/clawdbot "
"cliPath": " /opt/clawdbot ",
])
#expect(parsed.lanHost == "studio.local")
#expect(parsed.tailnetDns == "peters-mac-studio-1.ts.net")
@@ -84,7 +84,7 @@ struct GatewayDiscoveryModelTests {
"lanHost": " ",
"tailnetDns": "\n",
"gatewayPort": "nope",
"sshPort": "nope"
"sshPort": "nope",
])
#expect(parsed.lanHost == nil)
#expect(parsed.tailnetDns == nil)

22
apps/macos/Tests/ClawdbotIPCTests/LowCoverageHelperTests.swift
View File

@@ -1,7 +1,7 @@
import AppKit
import ClawdbotProtocol
import Foundation
import Testing
import ClawdbotProtocol
@testable import Clawdbot
@@ -98,17 +98,17 @@ struct LowCoverageHelperTests {
[
"CLAWDBOT_GATEWAY_BIND": "Lan",
"CLAWDBOT_GATEWAY_TOKEN": " secret ",
])
{
#expect(GatewayLaunchAgentManager._testPreferredGatewayBind() == "lan")
#expect(GatewayLaunchAgentManager._testPreferredGatewayToken() == "secret")
#expect(
GatewayLaunchAgentManager._testEscapePlistValue("a&b<c>\"'") ==
"a&amp;b&lt;c&gt;&quot;&apos;")
]) {
#expect(GatewayLaunchAgentManager._testPreferredGatewayBind() == "lan")
#expect(GatewayLaunchAgentManager._testPreferredGatewayToken() == "secret")
#expect(
GatewayLaunchAgentManager._testEscapePlistValue("a&b<c>\"'") ==
"a&amp;b&lt;c&gt;&quot;&apos;")
#expect(GatewayLaunchAgentManager._testGatewayExecutablePath(bundlePath: "/App") == "/App/Contents/Resources/Relay/clawdbot")
#expect(GatewayLaunchAgentManager._testRelayDir(bundlePath: "/App") == "/App/Contents/Resources/Relay")
}
#expect(GatewayLaunchAgentManager
._testGatewayExecutablePath(bundlePath: "/App") == "/App/Contents/Resources/Relay/clawdbot")
#expect(GatewayLaunchAgentManager._testRelayDir(bundlePath: "/App") == "/App/Contents/Resources/Relay")
}
}
@Test func portGuardianParsesListenersAndBuildsReports() {

2
apps/macos/Tests/ClawdbotIPCTests/LowCoverageViewSmokeTests.swift
View File

@@ -1,7 +1,7 @@
import AppKit
import ClawdbotProtocol
import SwiftUI
import Testing
import ClawdbotProtocol
@testable import Clawdbot

2
apps/macos/Tests/ClawdbotIPCTests/MacNodeBridgeDiscoveryTests.swift
View File

@@ -138,7 +138,7 @@ private func waitForListenerReady(_ listener: NWListener, timeoutSeconds: Double
switch state {
case .ready:
finish(.success(()))
case .failed(let err):
case let .failed(err):
finish(.failure(err))
case .cancelled:
finish(.failure(ListenerTimeoutError()))

6
apps/macos/Tests/ClawdbotIPCTests/MacNodeRuntimeTests.swift
View File

@@ -15,7 +15,7 @@ struct MacNodeRuntimeTests {
@Test func handleInvokeRejectsEmptySystemRun() async throws {
let runtime = MacNodeRuntime()
let params = ClawdbotSystemRunParams(command: [])
let json = String(data: try JSONEncoder().encode(params), encoding: .utf8)
let json = try String(data: JSONEncoder().encode(params), encoding: .utf8)
let response = await runtime.handleInvoke(
BridgeInvokeRequest(id: "req-2", command: ClawdbotSystemCommand.run.rawValue, paramsJSON: json))
#expect(response.ok == false)
@@ -24,7 +24,7 @@ struct MacNodeRuntimeTests {
@Test func handleInvokeRejectsEmptyNotification() async throws {
let runtime = MacNodeRuntime()
let params = ClawdbotSystemNotifyParams(title: "", body: "")
let json = String(data: try JSONEncoder().encode(params), encoding: .utf8)
let json = try String(data: JSONEncoder().encode(params), encoding: .utf8)
let response = await runtime.handleInvoke(
BridgeInvokeRequest(id: "req-3", command: ClawdbotSystemCommand.notify.rawValue, paramsJSON: json))
#expect(response.ok == false)
@@ -71,7 +71,7 @@ struct MacNodeRuntimeTests {
let runtime = MacNodeRuntime(makeMainActorServices: { services })
let params = MacNodeScreenRecordParams(durationMs: 250)
let json = String(data: try JSONEncoder().encode(params), encoding: .utf8)
let json = try String(data: JSONEncoder().encode(params), encoding: .utf8)
let response = await runtime.handleInvoke(
BridgeInvokeRequest(id: "req-5", command: MacNodeScreenCommand.record.rawValue, paramsJSON: json))
#expect(response.ok == true)

1
apps/macos/Tests/ClawdbotIPCTests/ModelCatalogLoaderTests.swift
View File

@@ -51,4 +51,3 @@ struct ModelCatalogLoaderTests {
#expect(choices.isEmpty)
}
}

1
apps/macos/Tests/ClawdbotIPCTests/NodeManagerPathsTests.swift
View File

@@ -43,4 +43,3 @@ import Testing
#expect(!bins.contains(missingNodeBin.path))
}
}

2
apps/macos/Tests/ClawdbotIPCTests/NodePairingReconcilePolicyTests.swift
View File

@@ -9,6 +9,6 @@ import Testing
}
@Test func policyUsesSlowSafetyInterval() {
#expect(NodePairingReconcilePolicy.activeIntervalMs >= 10_000)
#expect(NodePairingReconcilePolicy.activeIntervalMs >= 10000)
}
}

2
apps/macos/Tests/ClawdbotIPCTests/OnboardingWizardStepViewTests.swift
View File

@@ -1,6 +1,6 @@
import ClawdbotProtocol
import SwiftUI
import Testing
import ClawdbotProtocol
@testable import Clawdbot
@Suite(.serialized)

2
apps/macos/Tests/ClawdbotIPCTests/PermissionManagerTests.swift
View File

@@ -1,6 +1,6 @@
import Testing
import ClawdbotIPC
import CoreLocation
import Testing
@testable import Clawdbot
@Suite(.serialized)

1
apps/macos/Tests/ClawdbotIPCTests/ScreenshotSizeTests.swift
View File

@@ -19,4 +19,3 @@ struct ScreenshotSizeTests {
#expect(ScreenshotSize.readPNGSize(data: Data("nope".utf8)) == nil)
}
}

2
apps/macos/Tests/ClawdbotIPCTests/SessionDataTests.swift
View File

@@ -14,7 +14,7 @@ struct SessionDataTests {
@Test func sessionTokenStatsFormatKTokensRoundsAsExpected() {
#expect(SessionTokenStats.formatKTokens(999) == "999")
#expect(SessionTokenStats.formatKTokens(1000) == "1.0k")
#expect(SessionTokenStats.formatKTokens(12_340) == "12k")
#expect(SessionTokenStats.formatKTokens(12340) == "12k")
}
@Test func sessionTokenStatsPercentUsedClampsTo100() {

2
apps/macos/Tests/ClawdbotIPCTests/SkillsSettingsSmokeTests.swift
View File

@@ -1,5 +1,5 @@
import Testing
import ClawdbotProtocol
import Testing
@testable import Clawdbot
@Suite(.serialized)

6
apps/macos/Tests/ClawdbotIPCTests/TalkAudioPlayerTests.swift
View File

@@ -84,13 +84,13 @@ private func makeWav16Mono(sampleRate: UInt32, samples: Int) -> Data {
return data
}
private extension Data {
mutating func appendLEUInt16(_ value: UInt16) {
extension Data {
fileprivate mutating func appendLEUInt16(_ value: UInt16) {
var v = value.littleEndian
Swift.withUnsafeBytes(of: &v) { append(contentsOf: $0) }
}
mutating func appendLEUInt32(_ value: UInt32) {
fileprivate mutating func appendLEUInt32(_ value: UInt32) {
var v = value.littleEndian
Swift.withUnsafeBytes(of: &v) { append(contentsOf: $0) }
}

4
apps/macos/Tests/ClawdbotIPCTests/TestIsolation.swift
View File

@@ -98,14 +98,14 @@ enum TestIsolation {
_ values: [String: String?],
_ body: () async throws -> T) async rethrows -> T
{
try await Self.withIsolatedState(env: values, defaults: [:], body)
try await self.withIsolatedState(env: values, defaults: [:], body)
}
static func withUserDefaultsValues<T>(
_ values: [String: Any?],
_ body: () async throws -> T) async rethrows -> T
{
try await Self.withIsolatedState(env: [:], defaults: values, body)
try await self.withIsolatedState(env: [:], defaults: values, body)
}
nonisolated static func tempConfigPath() -> String {

1
apps/macos/Tests/ClawdbotIPCTests/VoiceWakeOverlayViewSmokeTests.swift
View File

@@ -26,4 +26,3 @@ struct VoiceWakeOverlayViewSmokeTests {
_ = view.body
}
}

2
apps/macos/Tests/ClawdbotIPCTests/VoiceWakeRuntimeTests.swift
View File

@@ -1,6 +1,6 @@
import Foundation
import Testing
import SwabbleKit
import Testing
@testable import Clawdbot
@Suite struct VoiceWakeRuntimeTests {

2
apps/macos/Tests/ClawdbotIPCTests/VoiceWakeTesterTests.swift
View File

@@ -1,6 +1,6 @@
import Foundation
import Testing
import SwabbleKit
import Testing
struct VoiceWakeTesterTests {
@Test func matchRespectsGapRequirement() {

2
apps/macos/Tests/ClawdbotIPCTests/WorkActivityStoreTests.swift
View File

@@ -1,6 +1,6 @@
import ClawdbotProtocol
import Foundation
import Testing
import ClawdbotProtocol
@testable import Clawdbot
@Suite