@sriinnu/runic 1.2.0 → 2.0.0

package/Sources/RunicCLI/Commands/UsageLedgerSourceFactory.swift

@@ -5,38 +5,38 @@ enum UsageLedgerSourceFactory {
     static func source(
         for provider: UsageProvider,
         now: Date,
-        maxAgeDays: Int
-    ) -> (any UsageLedgerSource)? {
+        maxAgeDays: Int) -> (any UsageLedgerSource)?
+    {
         switch provider {
         case .claude:
             return ClaudeUsageLogSource(maxAgeDays: maxAgeDays, now: now)
         case .codex:
             return CodexUsageLogSource(maxAgeDays: maxAgeDays, now: now)
         case .copilot,
-            .gemini,
-            .antigravity,
-            .cursor,
-            .factory,
-            .zai,
-            .minimax,
-            .openrouter,
-            .groq,
-            .deepseek,
-            .fireworks,
-            .mistral,
-            .perplexity,
-            .kimi,
-            .auggie,
-            .together,
-            .cohere,
-            .xai,
-            .cerebras,
-            .sambanova,
-            .azure,
-            .bedrock,
-            .vertexai,
-            .qwen:
-            return Self.otelHistorySource(provider: provider, now: now, maxAgeDays: maxAgeDays)
+             .gemini,
+             .antigravity,
+             .cursor,
+             .factory,
+             .zai,
+             .minimax,
+             .openrouter,
+             .groq,
+             .deepseek,
+             .fireworks,
+             .mistral,
+             .perplexity,
+             .kimi,
+             .auggie,
+             .together,
+             .cohere,
+             .xai,
+             .cerebras,
+             .sambanova,
+             .azure,
+             .bedrock,
+             .vertexai,
+             .qwen:
+            return self.otelHistorySource(provider: provider, now: now, maxAgeDays: maxAgeDays)
         @unknown default:
             return nil
         }
@@ -45,8 +45,8 @@ enum UsageLedgerSourceFactory {
     private static func otelHistorySource(
         provider: UsageProvider,
         now: Date,
-        maxAgeDays: Int
-    ) -> (any UsageLedgerSource)? {
+        maxAgeDays: Int) -> (any UsageLedgerSource)?
+    {
         let files = self.otelLedgerFiles(for: provider)
         guard !files.isEmpty else { return nil }
 
@@ -75,7 +75,7 @@ enum UsageLedgerSourceFactory {
             Self.splitPathList(env["RUNIC_\(providerKey)_OTEL_GENAI_LOG_PATH"]),
             Self.splitPathList(env["RUNIC_\(providerKey)_OTEL_LOG_PATHS"]),
             Self.splitPathList(env["RUNIC_\(providerKey)_OTEL_LOG_PATH"]),
-        ].flatMap { $0 }
+        ].flatMap(\.self)
 
         let urls = candidatePaths.compactMap(Self.expandTildePath)
         return Self.discoverOTelLedgerFiles(from: urls)
@@ -135,8 +135,7 @@ enum UsageLedgerSourceFactory {
         guard let enumerator = FileManager.default.enumerator(
             at: directory,
             includingPropertiesForKeys: [.isRegularFileKey, .isDirectoryKey],
-            options: [.skipsHiddenFiles]
-        ) else { return [] }
+            options: [.skipsHiddenFiles]) else { return [] }
 
         var files: [URL] = []
         for case let file as URL in enumerator where Self.isSupportedOTelFile(file) {
@@ -145,7 +144,7 @@ enum UsageLedgerSourceFactory {
         return files
     }
 
-    private struct UsageLedgerProviderFilterSource: UsageLedgerSource, Sendable {
+    private struct UsageLedgerProviderFilterSource: UsageLedgerSource {
         private let source: any UsageLedgerSource
         private let provider: UsageProvider
         private let minTimestamp: Date?

package/Sources/RunicClaudeWebProbe/main.swift

@@ -1,5 +1,5 @@
-import RunicCore
 import Foundation
+import RunicCore
 
 @main
 enum RunicClaudeWebProbe {

package/Sources/RunicCore/AlertRuleStore.swift

@@ -2,7 +2,7 @@ import Foundation
 import RunicCore
 
 /// Storage for alert rules, alert history, and webhook configurations
-public struct AlertRuleStore {
+public enum AlertRuleStore {
     // MARK: - Types
 
     public enum AlertType: String, Codable, Sendable {
@@ -40,8 +40,8 @@ public struct AlertRuleStore {
             notifyWebhook: Bool = false,
             webhookURL: String? = nil,
             enabled: Bool = true,
-            createdAt: Date = Date()
-        ) {
+            createdAt: Date = Date())
+        {
             self.id = id
             self.type = type
             self.projectID = projectID
@@ -71,8 +71,8 @@ public struct AlertRuleStore {
             message: String,
             severity: AlertSeverity,
             acknowledged: Bool = false,
-            acknowledgedAt: Date? = nil
-        ) {
+            acknowledgedAt: Date? = nil)
+        {
             self.id = id
             self.alertID = alertID
             self.triggeredAt = triggeredAt
@@ -107,7 +107,7 @@ public struct AlertRuleStore {
     // MARK: - Public Methods
 
     public static func load() -> AlertsData {
-        guard FileManager.default.fileExists(atPath: storageURL.path) else {
+        guard FileManager.default.fileExists(atPath: self.storageURL.path) else {
             return AlertsData()
         }
 
@@ -128,35 +128,35 @@ public struct AlertRuleStore {
         encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
 
         let data = try encoder.encode(alertsData)
-        try data.write(to: storageURL, options: .atomic)
+        try data.write(to: self.storageURL, options: .atomic)
     }
 
     public static func addRule(_ rule: AlertRule) throws {
-        var data = load()
+        var data = self.load()
         data.rules.append(rule)
-        try save(data)
+        try self.save(data)
     }
 
     public static func removeRule(id: String) throws {
-        var data = load()
+        var data = self.load()
         data.rules.removeAll { $0.id == id }
-        try save(data)
+        try self.save(data)
     }
 
     public static func updateRule(_ rule: AlertRule) throws {
-        var data = load()
+        var data = self.load()
         if let index = data.rules.firstIndex(where: { $0.id == rule.id }) {
             data.rules[index] = rule
-            try save(data)
+            try self.save(data)
         }
     }
 
     public static func getEnabledRules() -> [AlertRule] {
-        load().rules.filter { $0.enabled }
+        self.load().rules.filter(\.enabled)
     }
 
     public static func addHistoryEntry(_ entry: AlertHistoryEntry) throws {
-        var data = load()
+        var data = self.load()
         data.history.append(entry)
 
         // Keep last 100 history entries
@@ -164,24 +164,24 @@ public struct AlertRuleStore {
             data.history = Array(data.history.suffix(100))
         }
 
-        try save(data)
+        try self.save(data)
     }
 
     public static func acknowledgeAlert(id: String) throws {
-        var data = load()
+        var data = self.load()
         if let index = data.history.firstIndex(where: { $0.id == id }) {
             data.history[index].acknowledged = true
             data.history[index].acknowledgedAt = Date()
-            try save(data)
+            try self.save(data)
         }
     }
 
     public static func getRecentHistory(limit: Int = 20) -> [AlertHistoryEntry] {
-        let history = load().history.sorted { $0.triggeredAt > $1.triggeredAt }
+        let history = self.load().history.sorted { $0.triggeredAt > $1.triggeredAt }
         return Array(history.prefix(limit))
     }
 
     public static func getUnacknowledgedAlerts() -> [AlertHistoryEntry] {
-        load().history.filter { !$0.acknowledged }
+        self.load().history.filter { !$0.acknowledged }
     }
 }

package/Sources/RunicCore/BrowserCookieImportOrder.swift

@@ -3,15 +3,15 @@ import Silo
 
 public typealias BrowserCookieImportOrder = [Browser]
 
-public extension Collection where Element == Browser {
+extension Collection<Browser> {
     /// Returns a user-friendly hint about which browsers to log in to.
-    var loginHint: String {
+    public var loginHint: String {
         if self.isEmpty {
             return "your browser"
         } else if self.count == 1, let first = self.first {
             return first.displayName
         } else {
-            let names = self.map { $0.displayName }
+            let names = self.map(\.displayName)
             return names.dropLast().joined(separator: ", ") + " or " + (names.last ?? "")
         }
     }

package/Sources/RunicCore/CostUsageModels.swift

@@ -377,7 +377,7 @@ public struct CostUsageMonthlyReport: Sendable, Decodable {
     }
 }
 
-private struct CostUsageLegacyTotals: Sendable, Decodable {
+private struct CostUsageLegacyTotals: Decodable {
     let totalInputTokens: Int?
     let totalOutputTokens: Int?
     let cacheReadTokens: Int?

package/Sources/RunicCore/CustomProviders/CustomProviderModels.swift

@@ -23,8 +23,8 @@ public struct CustomProviderConfig: Codable, Sendable, Identifiable {
         endpoints: EndpointConfig,
         colorHex: String? = nil,
         createdAt: Date = Date(),
-        updatedAt: Date = Date()
-    ) {
+        updatedAt: Date = Date())
+    {
         self.id = id
         self.name = name
         self.icon = icon
@@ -43,10 +43,10 @@ public struct CustomProviderConfig: Codable, Sendable, Identifiable {
 public struct AuthConfig: Codable, Sendable {
     public enum AuthType: String, Codable, Sendable {
         case apiKey = "api_key"
-        case bearer = "bearer"
-        case basic = "basic"
-        case oauth = "oauth"
-        case custom = "custom"
+        case bearer
+        case basic
+        case oauth
+        case custom
     }
 
     public let type: AuthType
@@ -60,8 +60,8 @@ public struct AuthConfig: Codable, Sendable {
         headerName: String,
         headerPrefix: String? = nil,
         tokenKeychain: String,
-        additionalHeaders: [String: String]? = nil
-    ) {
+        additionalHeaders: [String: String]? = nil)
+    {
         self.type = type
         self.headerName = headerName
         self.headerPrefix = headerPrefix
@@ -79,8 +79,8 @@ public struct EndpointConfig: Codable, Sendable {
 
     public init(
         usage: UsageEndpoint? = nil,
-        balance: BalanceEndpoint? = nil
-    ) {
+        balance: BalanceEndpoint? = nil)
+    {
         self.usage = usage
         self.balance = balance
     }
@@ -99,8 +99,8 @@ public struct UsageEndpoint: Codable, Sendable {
         url: String,
         method: HTTPMethod = .GET,
         mapping: ResponseMapping,
-        queryParams: [String: String]? = nil
-    ) {
+        queryParams: [String: String]? = nil)
+    {
         self.url = url
         self.method = method
         self.mapping = mapping
@@ -119,8 +119,8 @@ public struct BalanceEndpoint: Codable, Sendable {
     public init(
         url: String,
         method: HTTPMethod = .GET,
-        mapping: ResponseMapping
-    ) {
+        mapping: ResponseMapping)
+    {
         self.url = url
         self.method = method
         self.mapping = mapping
@@ -146,7 +146,7 @@ public struct ResponseMapping: Codable, Sendable {
     public var resetDate: String? // JSONPath to reset date
     public var tokens: String? // JSONPath to token count
 
-    // Nested object support (e.g., "data.usage.tokens")
+    /// Nested object support (e.g., "data.usage.tokens")
     public var nestedPaths: Bool // Support dot notation
 
     public init(
@@ -156,8 +156,8 @@ public struct ResponseMapping: Codable, Sendable {
         cost: String? = nil,
         resetDate: String? = nil,
         tokens: String? = nil,
-        nestedPaths: Bool = true
-    ) {
+        nestedPaths: Bool = true)
+    {
         self.quota = quota
         self.used = used
         self.remaining = remaining
@@ -185,8 +185,8 @@ public struct CustomUsageData: Codable, Sendable {
         remaining: Double? = nil,
         cost: Double? = nil,
         resetDate: Date? = nil,
-        tokens: Int? = nil
-    ) {
+        tokens: Int? = nil)
+    {
         self.quota = quota
         self.used = used
         self.remaining = remaining
@@ -211,8 +211,8 @@ public struct CustomProviderSnapshot: Codable, Sendable {
         providerName: String,
         usageData: CustomUsageData,
         updatedAt: Date = Date(),
-        error: String? = nil
-    ) {
+        error: String? = nil)
+    {
         self.providerID = providerID
         self.providerName = providerName
         self.usageData = usageData
@@ -223,35 +223,34 @@ public struct CustomProviderSnapshot: Codable, Sendable {
     /// Convert to RateWindow for UI compatibility
     public func toRateWindow() -> RateWindow? {
         guard let quota = usageData.quota,
-              let used = usageData.used else {
+              let used = usageData.used
+        else {
             return nil
         }
 
         let usedPercent = quota > 0 ? (used / quota) * 100.0 : 0.0
         let windowMinutes: Int? = nil // Custom providers might not have window concept
-        let resetsAt = usageData.resetDate
+        let resetsAt = self.usageData.resetDate
         let resetDescription = resetsAt.map { UsageFormatter.resetDescription(from: $0) }
 
         return RateWindow(
             usedPercent: usedPercent,
             windowMinutes: windowMinutes,
             resetsAt: resetsAt,
-            resetDescription: resetDescription
-        )
+            resetDescription: resetDescription)
     }
 
     /// Create snapshot from usage data and config
     public static func from(
         usageData: CustomUsageData,
-        config: CustomProviderConfig
-    ) -> CustomProviderSnapshot {
-        return CustomProviderSnapshot(
+        config: CustomProviderConfig) -> CustomProviderSnapshot
+    {
+        CustomProviderSnapshot(
             providerID: config.id,
             providerName: config.name,
             usageData: usageData,
             updatedAt: Date(),
-            error: nil
-        )
+            error: nil)
     }
 }