@sriinnu/runic 1.2.0 → 2.0.0

package/Sources/RunicCore/Providers/MiniMax/MiniMaxUsageFetcher.swift

@@ -18,7 +18,7 @@ public struct MiniMaxModelRemain: Decodable {
     public let modelName: String
     public let currentIntervalTotalCount: Int
     public let currentIntervalUsageCount: Int
-    
+
     enum CodingKeys: String, CodingKey {
         case modelName = "model_name"
         case currentIntervalTotalCount = "current_interval_total_count"
@@ -62,9 +62,9 @@ extension MiniMaxUsageSnapshot {
         // But let's assume standard "usage" field naming means USED.
         // If the user reports it shows 100% when new, we invert it.
         // For now, let's map it as Used/Total.
-        
+
         let percent = self.total > 0 ? (Double(self.used) / Double(self.total)) * 100.0 : 0.0
-        
+
         let primary = RateWindow(
             usedPercent: percent,
             windowMinutes: 24 * 60,
@@ -77,7 +77,7 @@ extension MiniMaxUsageSnapshot {
             accountEmail: nil,
             accountOrganization: nil,
             loginMethod: "api-key")
-            
+
         return UsageSnapshot(
             primary: primary,
             secondary: nil,
@@ -126,11 +126,11 @@ public struct MiniMaxUsageFetcher: Sendable {
             let apiResponse = try decoder.decode(MiniMaxQuotaResponse.self, from: data)
 
             if apiResponse.baseResponse.statusCode != 0 {
-                 throw MiniMaxUsageError.apiError(apiResponse.baseResponse.statusMsg)
+                throw MiniMaxUsageError.apiError(apiResponse.baseResponse.statusMsg)
             }
 
             guard let firstModel = apiResponse.modelRemains?.first else {
-                 throw MiniMaxUsageError.parseFailed("No model quota found")
+                throw MiniMaxUsageError.parseFailed("No model quota found")
             }
 
             return MiniMaxUsageSnapshot(
@@ -138,7 +138,7 @@ public struct MiniMaxUsageFetcher: Sendable {
                 used: firstModel.currentIntervalUsageCount,
                 modelName: firstModel.modelName,
                 updatedAt: Date())
-                
+
         } catch {
             Self.log.error("MiniMax parsing error: \(error.localizedDescription)")
             throw MiniMaxUsageError.parseFailed(error.localizedDescription)

package/Sources/RunicCore/Providers/MiniMax/MiniMaxWebUsageFetcher.swift

@@ -225,13 +225,13 @@ public struct MiniMaxWebUsageFetcher: Sendable {
 
 // MARK: - Parsing helpers
 
-struct MiniMaxManualInput: Sendable {
+struct MiniMaxManualInput {
     let cookieHeader: String
     let accessToken: String?
     let groupID: String?
 }
 
-struct MiniMaxParsedUsage: Sendable {
+struct MiniMaxParsedUsage {
     let usedPercent: Double
     let windowMinutes: Int?
     let resetsAt: Date?
@@ -408,9 +408,9 @@ enum MiniMaxWebParsing {
         if let remaining = self.captureGroups(
             in: html,
             pattern: "(?i)Available usage[^0-9]*([0-9]+(?:\\.[0-9]+)?)")?.first,
-           let total = self.captureGroups(
-            in: html,
-            pattern: "(?i)Total usage[^0-9]*([0-9]+(?:\\.[0-9]+)?)")?.first
+            let total = self.captureGroups(
+                in: html,
+                pattern: "(?i)Total usage[^0-9]*([0-9]+(?:\\.[0-9]+)?)")?.first
         {
             let remainingValue = self.doubleValue(remaining) ?? 0
             let totalValue = self.doubleValue(total) ?? 0
@@ -613,7 +613,7 @@ enum MiniMaxWebParsing {
 }
 
 #if os(macOS)
-private struct MiniMaxWebSession: Sendable {
+private struct MiniMaxWebSession {
     let cookieHeader: String
     let accessToken: String?
     let groupID: String?
@@ -621,7 +621,7 @@ private struct MiniMaxWebSession: Sendable {
     let isManual: Bool
 }
 
-private struct MiniMaxCookieSession: Sendable {
+private struct MiniMaxCookieSession {
     let cookieHeader: String
     let sourceLabel: String
 }
@@ -674,7 +674,7 @@ private enum MiniMaxCookieImporter {
     }
 }
 
-private struct MiniMaxLocalStorageToken: Sendable {
+private struct MiniMaxLocalStorageToken {
     let accessToken: String
     let groupID: String?
     let sourceLabel: String
@@ -706,7 +706,7 @@ private enum MiniMaxLocalStorageImporter {
         return tokens
     }
 
-    private struct LocalStorageCandidate: Sendable {
+    private struct LocalStorageCandidate {
         let label: String
         let levelDBURL: URL
     }
@@ -789,7 +789,7 @@ private enum MiniMaxLocalStorageImporter {
         }
     }
 
-    private struct TokenMatch: Sendable {
+    private struct TokenMatch {
         let accessToken: String
         let groupID: String?
     }

package/Sources/RunicCore/Providers/Mistral/MistralProviderDescriptor.swift

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

package/Sources/RunicCore/Providers/Mistral/MistralUsageFetcher.swift

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

package/Sources/RunicCore/Providers/OpenRouter/OpenRouterProviderDescriptor.swift

@@ -1,5 +1,5 @@
-import RunicMacroSupport
 import Foundation
+import RunicMacroSupport
 
 @ProviderDescriptorRegistration
 @ProviderDescriptorDefinition
@@ -74,7 +74,7 @@ struct OpenRouterAPIFetchStrategy: ProviderFetchStrategy {
 
 // MARK: - Settings Errors
 
-enum OpenRouterSettingsError: LocalizedError, Sendable {
+enum OpenRouterSettingsError: LocalizedError {
     case missingToken
 
     var errorDescription: String? {

package/Sources/RunicCore/Providers/OpenRouter/OpenRouterUsageFetcher.swift

@@ -51,16 +51,30 @@ struct OpenRouterKeyInfoResponse: Decodable {
         }
     }
 
-    var keyUsage: Double { self.data?.usage ?? 0 }
-    var keyLimit: Double? { self.data?.limit }
-    var isFreeTier: Bool { self.data?.is_free_tier ?? false }
-    var rateLimitRequests: Int? { self.data?.rate_limit?.requests }
-    var rateLimitInterval: String? { self.data?.rate_limit?.interval }
+    var keyUsage: Double {
+        self.data?.usage ?? 0
+    }
+
+    var keyLimit: Double? {
+        self.data?.limit
+    }
+
+    var isFreeTier: Bool {
+        self.data?.is_free_tier ?? false
+    }
+
+    var rateLimitRequests: Int? {
+        self.data?.rate_limit?.requests
+    }
+
+    var rateLimitInterval: String? {
+        self.data?.rate_limit?.interval
+    }
 }
 
 // MARK: - Fetcher
 
-struct OpenRouterUsageFetcher {
+enum OpenRouterUsageFetcher {
     static let creditsURL = URL(string: "https://openrouter.ai/api/v1/credits")!
     static let keyInfoURL = URL(string: "https://openrouter.ai/api/v1/auth/key")!
     private static let requestTimeout: TimeInterval = 15
@@ -98,9 +112,9 @@ struct OpenRouterUsageFetcher {
 
     private static func fetchKeyInfoBestEffort(apiKey: String) async -> OpenRouterKeyInfoResponse? {
         do {
-            return try await Self.fetchKeyInfo(apiKey: apiKey)
+            return try await self.fetchKeyInfo(apiKey: apiKey)
         } catch {
-            Self.log.info("OpenRouter key info unavailable: \(error.localizedDescription)")
+            self.log.info("OpenRouter key info unavailable: \(error.localizedDescription)")
             return nil
         }
     }
@@ -124,7 +138,6 @@ struct OpenRouterUsageFetcher {
 
         return try JSONDecoder().decode(OpenRouterKeyInfoResponse.self, from: data)
     }
-
 }
 
 // MARK: - Snapshot conversion
@@ -185,7 +198,7 @@ extension OpenRouterCreditsResponse {
 
 // MARK: - Errors
 
-enum OpenRouterAPIError: LocalizedError, Sendable {
+enum OpenRouterAPIError: LocalizedError {
     case invalidResponse
     case httpError(statusCode: Int)
     case decodingError

package/Sources/RunicCore/Providers/Perplexity/PerplexityProviderDescriptor.swift

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

package/Sources/RunicCore/Providers/Perplexity/PerplexityUsageFetcher.swift

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

package/Sources/RunicCore/Providers/ProviderFetchPlan.swift

@@ -170,8 +170,8 @@ public struct ProviderFetchPipeline: Sendable {
 
     public init(
         resolveStrategies: @escaping @Sendable (ProviderFetchContext) async -> [any ProviderFetchStrategy],
-        strategyTimeout: TimeInterval = 45
-    ) {
+        strategyTimeout: TimeInterval = 45)
+    {
         self.resolveStrategies = resolveStrategies
         self.strategyTimeout = strategyTimeout
     }

package/Sources/RunicCore/Providers/ProviderTokenResolver.swift

@@ -472,11 +472,11 @@ public enum ProviderTokenResolver {
         if dataProtection {
             query[kSecUseDataProtectionKeychain as String] = true
         }
-#if canImport(LocalAuthentication)
+        #if canImport(LocalAuthentication)
         let authContext = LAContext()
         authContext.interactionNotAllowed = true
         query[kSecUseAuthenticationContext as String] = authContext
-#endif
+        #endif
 
         let status = SecItemCopyMatching(query as CFDictionary, &result)
         if status == errSecItemNotFound || status == errSecInteractionNotAllowed {

package/Sources/RunicCore/Providers/Qwen/QwenProviderDescriptor.swift

@@ -1,5 +1,5 @@
-import RunicMacroSupport
 import Foundation
+import RunicMacroSupport
 
 @ProviderDescriptorRegistration
 @ProviderDescriptorDefinition
@@ -33,7 +33,9 @@ public enum QwenProviderDescriptor {
                 color: ProviderColor(red: 1.0, green: 0.416, blue: 0.0)),
             tokenCost: ProviderTokenCostConfig(
                 supportsTokenCost: false,
-                noDataMessage: { "Qwen cost estimates are shown per-model in the details submenu (based on public DashScope pricing)." }),
+                noDataMessage: {
+                    "Qwen cost estimates are shown per-model in the details submenu (based on public DashScope pricing)."
+                }),
             fetchPlan: ProviderFetchPlan(
                 sourceModes: [.auto, .cli],
                 pipeline: ProviderFetchPipeline(resolveStrategies: { _ in [QwenAPIFetchStrategy()] })),
@@ -71,7 +73,7 @@ struct QwenAPIFetchStrategy: ProviderFetchStrategy {
     }
 }
 
-enum QwenSettingsError: LocalizedError, Sendable {
+enum QwenSettingsError: LocalizedError {
     case missingToken
 
     var errorDescription: String? {

package/Sources/RunicCore/Providers/Qwen/QwenUsageStats.swift

@@ -46,10 +46,10 @@ public enum QwenModelPricing {
         "qwen-turbo-latest": Tier(inputPerMillion: 0.30, outputPerMillion: 0.60, contextWindow: 131_072),
         "qwen-plus": Tier(inputPerMillion: 0.80, outputPerMillion: 2.00, contextWindow: 131_072),
         "qwen-plus-latest": Tier(inputPerMillion: 0.80, outputPerMillion: 2.00, contextWindow: 131_072),
-        "qwen-max": Tier(inputPerMillion: 2.40, outputPerMillion: 9.60, contextWindow: 32_768),
-        "qwen-max-latest": Tier(inputPerMillion: 2.40, outputPerMillion: 9.60, contextWindow: 32_768),
-        "qwen-vl-max": Tier(inputPerMillion: 3.00, outputPerMillion: 9.60, contextWindow: 32_768),
-        "qwen-vl-max-latest": Tier(inputPerMillion: 3.00, outputPerMillion: 9.60, contextWindow: 32_768),
+        "qwen-max": Tier(inputPerMillion: 2.40, outputPerMillion: 9.60, contextWindow: 32768),
+        "qwen-max-latest": Tier(inputPerMillion: 2.40, outputPerMillion: 9.60, contextWindow: 32768),
+        "qwen-vl-max": Tier(inputPerMillion: 3.00, outputPerMillion: 9.60, contextWindow: 32768),
+        "qwen-vl-max-latest": Tier(inputPerMillion: 3.00, outputPerMillion: 9.60, contextWindow: 32768),
         "qwen-vl-plus": Tier(inputPerMillion: 0.80, outputPerMillion: 2.00, contextWindow: 131_072),
         "qwen-long": Tier(inputPerMillion: 0.50, outputPerMillion: 2.00, contextWindow: 10_000_000),
         "qwen2.5-72b-instruct": Tier(inputPerMillion: 0.56, outputPerMillion: 1.12, contextWindow: 131_072),
@@ -185,11 +185,25 @@ private struct QwenModelUsageRaw: Decodable {
     let requests: Int?
     let calls: Int?
 
-    var resolvedModelID: String? { self.model_id ?? self.model }
-    var resolvedInputTokens: Int { self.input_tokens ?? 0 }
-    var resolvedOutputTokens: Int { self.output_tokens ?? 0 }
-    var resolvedTotalTokens: Int { self.total_tokens ?? self.tokens ?? (self.resolvedInputTokens + self.resolvedOutputTokens) }
-    var resolvedRequestCount: Int { self.request_count ?? self.requests ?? self.calls ?? 0 }
+    var resolvedModelID: String? {
+        self.model_id ?? self.model
+    }
+
+    var resolvedInputTokens: Int {
+        self.input_tokens ?? 0
+    }
+
+    var resolvedOutputTokens: Int {
+        self.output_tokens ?? 0
+    }
+
+    var resolvedTotalTokens: Int {
+        self.total_tokens ?? self.tokens ?? (self.resolvedInputTokens + self.resolvedOutputTokens)
+    }
+
+    var resolvedRequestCount: Int {
+        self.request_count ?? self.requests ?? self.calls ?? 0
+    }
 }
 
 // MARK: - Fetcher
@@ -241,11 +255,10 @@ public struct QwenUsageFetcher: Sendable {
             let output = model.resolvedOutputTokens
             let tokens = model.resolvedTotalTokens
             let requests = model.resolvedRequestCount
-            let cost: Double?
-            if input > 0 || output > 0 {
-                cost = QwenModelPricing.estimateCost(inputTokens: input, outputTokens: output, modelID: modelID)
+            let cost: Double? = if input > 0 || output > 0 {
+                QwenModelPricing.estimateCost(inputTokens: input, outputTokens: output, modelID: modelID)
             } else {
-                cost = QwenModelPricing.estimateCost(tokens: tokens, modelID: modelID)
+                QwenModelPricing.estimateCost(tokens: tokens, modelID: modelID)
             }
             entries.append(QwenModelUsageEntry(
                 modelID: modelID,

package/Sources/RunicCore/Providers/SambaNova/SambaNovaProviderDescriptor.swift

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

package/Sources/RunicCore/Providers/SambaNova/SambaNovaUsageFetcher.swift

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

package/Sources/RunicCore/Providers/Together/TogetherProviderDescriptor.swift

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

package/Sources/RunicCore/Providers/Together/TogetherUsageFetcher.swift

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

package/Sources/RunicCore/Providers/VertexAI/VertexAIProviderDescriptor.swift

@@ -1,5 +1,5 @@
-import RunicMacroSupport
 import Foundation
+import RunicMacroSupport
 
 @ProviderDescriptorRegistration
 @ProviderDescriptorDefinition
@@ -75,7 +75,7 @@ struct VertexAICLIFetchStrategy: ProviderFetchStrategy {
     }
 
     private static func resolveProject(context: ProviderFetchContext) -> String? {
-        if let project = Self.cleaned(context.settings?.vertexai?.project) {
+        if let project = cleaned(context.settings?.vertexai?.project) {
             return project
         }
         if let project = Self.cleaned(context.env["VERTEX_AI_PROJECT"]) {
@@ -91,7 +91,7 @@ struct VertexAICLIFetchStrategy: ProviderFetchStrategy {
     }
 
     private static func resolveLocation(context: ProviderFetchContext) -> String? {
-        if let location = Self.cleaned(context.settings?.vertexai?.location) {
+        if let location = cleaned(context.settings?.vertexai?.location) {
             return location
         }
         if let location = Self.cleaned(context.env["VERTEX_AI_LOCATION"]) {
@@ -110,13 +110,13 @@ struct VertexAICLIFetchStrategy: ProviderFetchStrategy {
     }
 }
 
-enum VertexAISettingsError: LocalizedError, Sendable {
+enum VertexAISettingsError: LocalizedError {
     case missingProject
 
     var errorDescription: String? {
         switch self {
         case .missingProject:
-            return "Google Cloud project not found. Set it in Preferences \u{2192} Providers \u{2192} Vertex AI or " +
+            "Google Cloud project not found. Set it in Preferences \u{2192} Providers \u{2192} Vertex AI or " +
                 "export VERTEX_AI_PROJECT."
         }
     }

package/Sources/RunicCore/Providers/VertexAI/VertexAISettingsReader.swift

@@ -27,7 +27,7 @@ public struct VertexAISettingsReader: Sendable {
     public static func credentials(
         environment: [String: String] = ProcessInfo.processInfo.environment) -> String?
     {
-        self.cleaned(environment[credentialsKey])
+        self.cleaned(environment[self.credentialsKey])
     }
 
     static func cleaned(_ raw: String?) -> String? {

package/Sources/RunicCore/Providers/VertexAI/VertexAIUsageFetcher.swift

@@ -1,7 +1,7 @@
 import Foundation
 
-struct VertexAIModelsResponse: Decodable, Sendable {
-    struct Model: Decodable, Sendable {
+struct VertexAIModelsResponse: Decodable {
+    struct Model: Decodable {
         let name: String?
         let displayName: String?
     }
@@ -117,7 +117,7 @@ extension VertexAIModelsResponse {
     }
 }
 
-enum VertexAICLIError: LocalizedError, Sendable {
+enum VertexAICLIError: LocalizedError {
     case gcloudNotFound
     case commandFailed(statusCode: Int, detail: String?)
     case commandTimedOut

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()] })),