@sriinnu/runic 1.0.0 → 2.0.0

package/Sources/RunicCore/Providers/XAI/XAIProviderDescriptor.swift

@@ -1,5 +1,5 @@
-import RunicMacroSupport
 import Foundation
+import RunicMacroSupport
 
 @ProviderDescriptorRegistration
 @ProviderDescriptorDefinition
@@ -71,7 +71,7 @@ struct XAIApiFetchStrategy: ProviderFetchStrategy {
     }
 }
 
-enum XAISettingsError: LocalizedError, Sendable {
+enum XAISettingsError: LocalizedError {
     case missingToken
 
     var errorDescription: String? {

package/Sources/RunicCore/Providers/XAI/XAIUsageFetcher.swift

@@ -8,7 +8,7 @@ struct XAIModelsResponse: Decodable {
     }
 }
 
-struct XAIUsageFetcher {
+enum XAIUsageFetcher {
     static let apiURL = URL(string: "https://api.x.ai/v1/models")!
 
     static func fetchModels(apiKey: String) async throws -> XAIModelsResponse {
@@ -57,7 +57,7 @@ extension XAIModelsResponse {
     }
 }
 
-enum XAIApiError: LocalizedError, Sendable {
+enum XAIApiError: LocalizedError {
     case invalidResponse
     case httpError(statusCode: Int, body: String?)
 

package/Sources/RunicCore/Providers/Zai/ZaiProviderDescriptor.swift

@@ -1,5 +1,5 @@
-import RunicMacroSupport
 import Foundation
+import RunicMacroSupport
 
 @ProviderDescriptorRegistration
 @ProviderDescriptorDefinition
@@ -33,7 +33,9 @@ public enum ZaiProviderDescriptor {
                 color: ProviderColor(red: 232 / 255, green: 90 / 255, blue: 106 / 255)),
             tokenCost: ProviderTokenCostConfig(
                 supportsTokenCost: false,
-                noDataMessage: { "z.ai cost estimates are shown per-model in the details submenu (based on public API pricing)." }),
+                noDataMessage: {
+                    "z.ai cost estimates are shown per-model in the details submenu (based on public API pricing)."
+                }),
             fetchPlan: ProviderFetchPlan(
                 sourceModes: [.auto, .cli],
                 pipeline: ProviderFetchPipeline(resolveStrategies: { _ in [ZaiAPIFetchStrategy()] })),

package/Sources/RunicCore/Providers/Zai/ZaiUsageStats.swift

@@ -207,8 +207,8 @@ public enum ZaiModelPricing {
         "glm-4.7-thinking": Tier(inputPerMillion: 0.38, outputPerMillion: 1.75, contextWindow: 203_000),
         "glm-4.6": Tier(inputPerMillion: 0.39, outputPerMillion: 1.74, contextWindow: 205_000),
         "glm-4.6-thinking": Tier(inputPerMillion: 0.39, outputPerMillion: 1.74, contextWindow: 205_000),
-        "glm-4.5v": Tier(inputPerMillion: 0.60, outputPerMillion: 1.80, contextWindow: 66_000),
-        "glm-4.5v-thinking": Tier(inputPerMillion: 0.60, outputPerMillion: 1.80, contextWindow: 66_000),
+        "glm-4.5v": Tier(inputPerMillion: 0.60, outputPerMillion: 1.80, contextWindow: 66000),
+        "glm-4.5v-thinking": Tier(inputPerMillion: 0.60, outputPerMillion: 1.80, contextWindow: 66000),
         "glm-4.5": Tier(inputPerMillion: 0.60, outputPerMillion: 2.20, contextWindow: 131_000),
         "glm-4.5-thinking": Tier(inputPerMillion: 0.60, outputPerMillion: 2.20, contextWindow: 131_000),
         "glm-5": Tier(inputPerMillion: 0.72, outputPerMillion: 2.30, contextWindow: 203_000),
@@ -321,13 +321,15 @@ private struct ZaiQuotaLimitResponse: Decodable {
     let data: ZaiQuotaLimitData?
     let success: Bool?
 
-    var isSuccess: Bool { (self.success ?? (self.code == 200)) && (self.code ?? 200) == 200 }
+    var isSuccess: Bool {
+        (self.success ?? (self.code == 200)) && (self.code ?? 200) == 200
+    }
 
     var errorMessage: String {
         self.msg ?? self.message ?? "Unknown API error (code: \(self.code ?? -1))"
     }
 
-    // Some responses use "message" instead of "msg".
+    /// Some responses use "message" instead of "msg".
     private let message: String?
 
     private enum CodingKeys: String, CodingKey {
@@ -407,8 +409,13 @@ private struct ZaiModelUsageResponse: Decodable {
         let total_tokens: Int?
         let total_prompts: Int?
 
-        var resolvedTotalTokens: Int? { self.totalTokens ?? self.total_tokens }
-        var resolvedTotalPrompts: Int? { self.totalPrompts ?? self.total_prompts }
+        var resolvedTotalTokens: Int? {
+            self.totalTokens ?? self.total_tokens
+        }
+
+        var resolvedTotalPrompts: Int? {
+            self.totalPrompts ?? self.total_prompts
+        }
     }
 
     struct ZaiModelUsageRaw: Decodable {
@@ -420,9 +427,17 @@ private struct ZaiModelUsageResponse: Decodable {
         let prompts: Int?
         let calls: Int?
 
-        var resolvedModelCode: String? { self.modelCode ?? self.model_code ?? self.model }
-        var resolvedTokens: Int { self.tokens ?? self.usage ?? 0 }
-        var resolvedPrompts: Int { self.prompts ?? self.calls ?? 0 }
+        var resolvedModelCode: String? {
+            self.modelCode ?? self.model_code ?? self.model
+        }
+
+        var resolvedTokens: Int {
+            self.tokens ?? self.usage ?? 0
+        }
+
+        var resolvedPrompts: Int {
+            self.prompts ?? self.calls ?? 0
+        }
     }
 }
 
@@ -438,7 +453,10 @@ private struct ZaiToolUsageResponse: Decodable {
         init(from decoder: Decoder) throws {
             let container = try decoder.container(keyedBy: DynamicKey.self)
             var toolEntries: [ZaiToolUsageRaw] = []
-            if let tools = try? container.decodeIfPresent([ZaiToolUsageRaw].self, forKey: DynamicKey(stringValue: "tools")!) {
+            if let tools = try? container.decodeIfPresent(
+                [ZaiToolUsageRaw].self,
+                forKey: DynamicKey(stringValue: "tools")!)
+            {
                 toolEntries = tools
             } else {
                 // Fallback: try top-level keys as tool names with int values
@@ -458,15 +476,25 @@ private struct ZaiToolUsageResponse: Decodable {
         let count: Int?
         let usage: Int?
 
-        var resolvedName: String? { self.tool ?? self.name }
-        var resolvedCount: Int { self.count ?? self.usage ?? 0 }
+        var resolvedName: String? {
+            self.tool ?? self.name
+        }
+
+        var resolvedCount: Int {
+            self.count ?? self.usage ?? 0
+        }
     }
 
     struct DynamicKey: CodingKey {
         var stringValue: String
         var intValue: Int?
-        init?(stringValue: String) { self.stringValue = stringValue }
-        init?(intValue: Int) { self.stringValue = "\(intValue)"; self.intValue = intValue }
+        init?(stringValue: String) {
+            self.stringValue = stringValue
+        }
+
+        init?(intValue: Int) {
+            self.stringValue = "\(intValue)"; self.intValue = intValue
+        }
     }
 }
 
@@ -508,7 +536,7 @@ public struct ZaiUsageFetcher: Sendable {
     // MARK: - Quota endpoint (required)
 
     private static func fetchQuota(apiKey: String) async throws -> (ZaiLimitEntry?, ZaiLimitEntry?, String?) {
-        let request = try self.makeRequest(url: quotaAPIURL, apiKey: apiKey)
+        let request = try self.makeRequest(url: self.quotaAPIURL, apiKey: apiKey)
         let (data, response) = try await URLSession.shared.data(for: request)
 
         guard let httpResponse = response as? HTTPURLResponse else {
@@ -520,9 +548,7 @@ public struct ZaiUsageFetcher: Sendable {
             throw ZaiUsageError.apiError("HTTP \(httpResponse.statusCode): \(errorMessage)")
         }
 
-        if let jsonString = String(data: data, encoding: .utf8) {
-            Self.log.debug("z.ai quota response: \(jsonString)")
-        }
+        Self.log.debug("z.ai quota response: HTTP \(httpResponse.statusCode), \(data.count) bytes")
 
         let apiResponse: ZaiQuotaLimitResponse
         do {
@@ -558,7 +584,7 @@ public struct ZaiUsageFetcher: Sendable {
         do {
             return try await self.fetchModelUsage(apiKey: apiKey)
         } catch {
-            Self.log.info("z.ai model-usage endpoint unavailable: \(error.localizedDescription)")
+            self.log.info("z.ai model-usage endpoint unavailable: \(error.localizedDescription)")
             return nil
         }
     }
@@ -573,9 +599,7 @@ public struct ZaiUsageFetcher: Sendable {
             throw ZaiUsageError.apiError("model-usage endpoint returned non-200")
         }
 
-        if let jsonString = String(data: data, encoding: .utf8) {
-            Self.log.debug("z.ai model-usage response: \(jsonString)")
-        }
+        Self.log.debug("z.ai model-usage response: HTTP \(httpResponse.statusCode), \(data.count) bytes")
 
         let raw = try JSONDecoder().decode(ZaiModelUsageResponse.self, from: data)
         let models = raw.data?.models ?? []
@@ -620,7 +644,7 @@ public struct ZaiUsageFetcher: Sendable {
         do {
             return try await self.fetchToolUsage(apiKey: apiKey)
         } catch {
-            Self.log.info("z.ai tool-usage endpoint unavailable: \(error.localizedDescription)")
+            self.log.info("z.ai tool-usage endpoint unavailable: \(error.localizedDescription)")
             return nil
         }
     }
@@ -635,9 +659,7 @@ public struct ZaiUsageFetcher: Sendable {
             throw ZaiUsageError.apiError("tool-usage endpoint returned non-200")
         }
 
-        if let jsonString = String(data: data, encoding: .utf8) {
-            Self.log.debug("z.ai tool-usage response: \(jsonString)")
-        }
+        Self.log.debug("z.ai tool-usage response: HTTP \(httpResponse.statusCode), \(data.count) bytes")
 
         let raw = try JSONDecoder().decode(ZaiToolUsageResponse.self, from: data)
         let tools = raw.data?.tools ?? []
@@ -665,11 +687,10 @@ public struct ZaiUsageFetcher: Sendable {
         var request = URLRequest(url: requestURL)
         request.httpMethod = "GET"
         // z.ai expects "Bearer <token>" — add prefix if the user didn't include it.
-        let authValue: String
-        if apiKey.lowercased().hasPrefix("bearer ") {
-            authValue = "Bearer \(apiKey.dropFirst(7).trimmingCharacters(in: .whitespaces))"
+        let authValue = if apiKey.lowercased().hasPrefix("bearer ") {
+            "Bearer \(apiKey.dropFirst(7).trimmingCharacters(in: .whitespaces))"
         } else {
-            authValue = "Bearer \(apiKey)"
+            "Bearer \(apiKey)"
         }
         request.setValue(authValue, forHTTPHeaderField: "Authorization")
         request.setValue("application/json", forHTTPHeaderField: "Accept")

package/Sources/RunicCore/Sync/BackgroundSyncManager.swift

@@ -1,5 +1,5 @@
-import Foundation
 import Combine
+import Foundation
 
 #if canImport(UIKit)
 import UIKit
@@ -21,7 +21,6 @@ import AppKit
 /// - Lifecycle-aware sync (app launch, foreground, background)
 /// - Network reachability monitoring
 public actor BackgroundSyncManager {
-
     // MARK: - Properties
 
     /// The underlying sync engine
@@ -49,7 +48,7 @@ public actor BackgroundSyncManager {
     /// Observers registered for sync events
     private var observers: [WeakSyncObserver] = []
 
-    /// Background task identifier (iOS only)
+    // Background task identifier (iOS only)
     #if canImport(UIKit)
     private var backgroundTaskID: UIBackgroundTaskIdentifier = .invalid
     #endif
@@ -63,14 +62,14 @@ public actor BackgroundSyncManager {
     ///   - config: Configuration for sync intervals and behavior
     public init(
         syncEngine: any SyncEngine,
-        config: SyncConfiguration = .default
-    ) {
+        config: SyncConfiguration = .default)
+    {
         self.syncEngine = syncEngine
         self.config = config
 
         // Register for app lifecycle notifications
         Task {
-            await registerLifecycleObservers()
+            await self.registerLifecycleObservers()
         }
     }
 
@@ -78,19 +77,19 @@ public actor BackgroundSyncManager {
 
     /// Starts background synchronization
     public func start() {
-        guard !isEnabled else { return }
+        guard !self.isEnabled else { return }
 
-        isEnabled = true
-        scheduleNextSync()
-        notifyObservers { $0.syncDidStart() }
+        self.isEnabled = true
+        self.scheduleNextSync()
+        self.notifyObservers { $0.syncDidStart() }
     }
 
     /// Stops background synchronization
     public func stop() {
-        isEnabled = false
+        self.isEnabled = false
         Task { @MainActor in
-            syncTimer?.invalidate()
-            syncTimer = nil
+            self.syncTimer?.invalidate()
+            self.syncTimer = nil
         }
     }
 
@@ -100,21 +99,21 @@ public actor BackgroundSyncManager {
     /// - Returns: Result of the sync operation
     @discardableResult
     public func syncNow(options: SyncOptions? = nil) async -> Result<SyncResult, SyncError> {
-        let syncOptions = options ?? config.defaultSyncOptions
+        let syncOptions = options ?? self.config.defaultSyncOptions
 
-        notifyObservers { $0.syncDidStart() }
+        self.notifyObservers { $0.syncDidStart() }
 
         let result = await syncEngine.sync(options: syncOptions)
 
         switch result {
-        case .success(let syncResult):
-            lastSyncDate = Date()
-            recordSyncHistory(success: true, result: syncResult)
-            notifyObservers { $0.syncDidComplete(result: syncResult) }
-
-        case .failure(let error):
-            recordSyncHistory(success: false, error: error)
-            notifyObservers { $0.syncDidFail(error: error) }
+        case let .success(syncResult):
+            self.lastSyncDate = Date()
+            self.recordSyncHistory(success: true, result: syncResult)
+            self.notifyObservers { $0.syncDidComplete(result: syncResult) }
+
+        case let .failure(error):
+            self.recordSyncHistory(success: false, error: error)
+            self.notifyObservers { $0.syncDidFail(error: error) }
         }
 
         return result
@@ -125,26 +124,25 @@ public actor BackgroundSyncManager {
     /// - Parameter observer: The observer to add
     public func addObserver(_ observer: SyncObserver) {
         let weakObserver = WeakSyncObserver(observer)
-        observers.append(weakObserver)
+        self.observers.append(weakObserver)
     }
 
     /// Removes an observer
     ///
     /// - Parameter observer: The observer to remove
     public func removeObserver(_ observer: SyncObserver) {
-        observers.removeAll { $0.observer === observer }
+        self.observers.removeAll { $0.observer === observer }
     }
 
     /// Returns sync statistics
     public var statistics: SyncStatistics {
         SyncStatistics(
-            lastSyncDate: lastSyncDate,
-            totalSyncs: syncHistory.count,
-            successfulSyncs: syncHistory.filter { $0.success }.count,
-            failedSyncs: syncHistory.filter { !$0.success }.count,
-            averageDuration: calculateAverageDuration(),
-            syncHistory: Array(syncHistory.suffix(10))
-        )
+            lastSyncDate: self.lastSyncDate,
+            totalSyncs: self.syncHistory.count,
+            successfulSyncs: self.syncHistory.count(where: { $0.success }),
+            failedSyncs: self.syncHistory.count(where: { !$0.success }),
+            averageDuration: self.calculateAverageDuration(),
+            syncHistory: Array(self.syncHistory.suffix(10)))
     }
 
     /// Updates sync configuration
@@ -153,8 +151,8 @@ public actor BackgroundSyncManager {
     public func updateConfiguration(_ config: SyncConfiguration) async {
         // Note: Configuration updates require recreating the manager
         // This is a placeholder - in practice, you'd want to make config mutable
-        if isEnabled {
-            stop()
+        if self.isEnabled {
+            self.stop()
             // Caller should create a new BackgroundSyncManager with new config
         }
     }
@@ -163,17 +161,17 @@ public actor BackgroundSyncManager {
 
     /// Schedules the next automatic sync
     private func scheduleNextSync() {
-        guard isEnabled else { return }
+        guard self.isEnabled else { return }
 
-        let interval = determineNextInterval()
+        let interval = self.determineNextInterval()
 
         Task { @MainActor [weak self] in
-            guard let self = self else { return }
+            guard let self else { return }
             self.syncTimer?.invalidate()
             self.syncTimer = Timer.scheduledTimer(
                 withTimeInterval: interval,
-                repeats: false
-            ) { [weak self] _ in
+                repeats: false)
+            { [weak self] _ in
                 Task {
                     await self?.performScheduledSync()
                 }
@@ -185,9 +183,9 @@ public actor BackgroundSyncManager {
     private func determineNextInterval() -> TimeInterval {
         #if canImport(UIKit)
         let isActive = UIApplication.shared.applicationState == .active
-        return isActive ? config.activeSyncInterval : config.backgroundSyncInterval
+        return isActive ? self.config.activeSyncInterval : self.config.backgroundSyncInterval
         #else
-        return config.activeSyncInterval
+        return self.config.activeSyncInterval
         #endif
     }
 
@@ -195,27 +193,27 @@ public actor BackgroundSyncManager {
     private func performScheduledSync() async {
         #if canImport(UIKit)
         // Begin background task
-        backgroundTaskID = UIApplication.shared.beginBackgroundTask { [weak self] in
+        self.backgroundTaskID = UIApplication.shared.beginBackgroundTask { [weak self] in
             self?.endBackgroundTask()
         }
         #endif
 
-        await syncNow()
+        await self.syncNow()
 
         #if canImport(UIKit)
-        endBackgroundTask()
+        self.endBackgroundTask()
         #endif
 
         // Schedule next sync
-        scheduleNextSync()
+        self.scheduleNextSync()
     }
 
     #if canImport(UIKit)
     /// Ends the background task
     private func endBackgroundTask() {
-        guard backgroundTaskID != .invalid else { return }
-        UIApplication.shared.endBackgroundTask(backgroundTaskID)
-        backgroundTaskID = .invalid
+        guard self.backgroundTaskID != .invalid else { return }
+        UIApplication.shared.endBackgroundTask(self.backgroundTaskID)
+        self.backgroundTaskID = .invalid
     }
     #endif
 
@@ -225,16 +223,16 @@ public actor BackgroundSyncManager {
         NotificationCenter.default.addObserver(
             forName: UIApplication.didBecomeActiveNotification,
             object: nil,
-            queue: .main
-        ) { [weak self] _ in
+            queue: .main)
+        { [weak self] _ in
             Task { await self?.handleAppBecameActive() }
         }
 
         NotificationCenter.default.addObserver(
             forName: UIApplication.didEnterBackgroundNotification,
             object: nil,
-            queue: .main
-        ) { [weak self] _ in
+            queue: .main)
+        { [weak self] _ in
             Task { await self?.handleAppEnteredBackground() }
         }
         #endif
@@ -243,16 +241,16 @@ public actor BackgroundSyncManager {
         NotificationCenter.default.addObserver(
             forName: NSApplication.didBecomeActiveNotification,
             object: nil,
-            queue: .main
-        ) { [weak self] _ in
+            queue: .main)
+        { [weak self] _ in
             Task { await self?.handleAppBecameActive() }
         }
 
         NotificationCenter.default.addObserver(
             forName: NSApplication.didResignActiveNotification,
             object: nil,
-            queue: .main
-        ) { [weak self] _ in
+            queue: .main)
+        { [weak self] _ in
             Task { await self?.handleAppEnteredBackground() }
         }
         #endif
@@ -260,18 +258,18 @@ public actor BackgroundSyncManager {
 
     /// Handles app becoming active
     private func handleAppBecameActive() async {
-        guard config.syncOnForeground else { return }
+        guard self.config.syncOnForeground else { return }
 
         // Sync if last sync was more than interval ago
-        if shouldSyncOnForeground() {
-            await syncNow()
+        if self.shouldSyncOnForeground() {
+            await self.syncNow()
         }
     }
 
     /// Handles app entering background
     private func handleAppEnteredBackground() async {
-        guard config.syncOnBackground else { return }
-        await syncNow()
+        guard self.config.syncOnBackground else { return }
+        await self.syncNow()
     }
 
     /// Determines if sync should occur on foreground
@@ -279,35 +277,34 @@ public actor BackgroundSyncManager {
         guard let lastSync = lastSyncDate else { return true }
 
         let elapsed = Date().timeIntervalSince(lastSync)
-        return elapsed >= config.activeSyncInterval
+        return elapsed >= self.config.activeSyncInterval
     }
 
     /// Records sync operation in history
     private func recordSyncHistory(
         success: Bool,
         result: SyncResult? = nil,
-        error: SyncError? = nil
-    ) {
+        error: SyncError? = nil)
+    {
         let entry = SyncHistoryEntry(
             timestamp: Date(),
             success: success,
             duration: result?.duration ?? 0,
             pushedCount: result?.pushedCount ?? 0,
             fetchedCount: result?.fetchedCount ?? 0,
-            error: error?.localizedDescription
-        )
+            error: error?.localizedDescription)
 
-        syncHistory.append(entry)
+        self.syncHistory.append(entry)
 
         // Trim history if needed
-        if syncHistory.count > maxHistoryEntries {
-            syncHistory.removeFirst(syncHistory.count - maxHistoryEntries)
+        if self.syncHistory.count > self.maxHistoryEntries {
+            self.syncHistory.removeFirst(self.syncHistory.count - self.maxHistoryEntries)
         }
     }
 
     /// Calculates average sync duration
     private func calculateAverageDuration() -> TimeInterval {
-        let successfulSyncs = syncHistory.filter { $0.success && $0.duration > 0 }
+        let successfulSyncs = self.syncHistory.filter { $0.success && $0.duration > 0 }
         guard !successfulSyncs.isEmpty else { return 0 }
 
         let totalDuration = successfulSyncs.reduce(0.0) { $0 + $1.duration }
@@ -317,10 +314,10 @@ public actor BackgroundSyncManager {
     /// Notifies all observers
     private func notifyObservers(_ action: (SyncObserver) -> Void) {
         // Clean up deallocated observers
-        observers.removeAll { $0.observer == nil }
+        self.observers.removeAll { $0.observer == nil }
 
         // Notify active observers
-        for weakObserver in observers {
+        for weakObserver in self.observers {
             if let observer = weakObserver.observer {
                 action(observer)
             }
@@ -343,8 +340,8 @@ public struct SyncConfiguration: Sendable {
         backgroundSyncInterval: TimeInterval = 3600,
         syncOnForeground: Bool = true,
         syncOnBackground: Bool = true,
-        defaultSyncOptions: SyncOptions = SyncOptions()
-    ) {
+        defaultSyncOptions: SyncOptions = SyncOptions())
+    {
         self.activeSyncInterval = activeSyncInterval
         self.backgroundSyncInterval = backgroundSyncInterval
         self.syncOnForeground = syncOnForeground
@@ -365,8 +362,8 @@ public struct SyncStatistics: Sendable {
     public let syncHistory: [SyncHistoryEntry]
 
     public var successRate: Double {
-        guard totalSyncs > 0 else { return 0 }
-        return Double(successfulSyncs) / Double(totalSyncs) * 100
+        guard self.totalSyncs > 0 else { return 0 }
+        return Double(self.successfulSyncs) / Double(self.totalSyncs) * 100
     }
 }
 
@@ -381,5 +378,7 @@ public struct SyncHistoryEntry: Sendable, Codable {
 
 private struct WeakSyncObserver {
     weak var observer: SyncObserver?
-    init(_ observer: SyncObserver) { self.observer = observer }
+    init(_ observer: SyncObserver) {
+        self.observer = observer
+    }
 }