@sriinnu/runic 1.0.0 → 2.0.0

package/Sources/Runic/Core/Stores/XAITokenStore.swift

@@ -1,5 +1,5 @@
-import RunicCore
 import Foundation
+import RunicCore
 import Security
 
 protocol XAITokenStoring: Sendable {
@@ -53,29 +53,16 @@ struct KeychainXAITokenStore: XAITokenStoring {
         }
 
         let data = cleaned!.data(using: .utf8)!
-        let query = self.baseQuery(dataProtection: false)
-        let attributes: [String: Any] = [
-            kSecValueData as String: data,
-            kSecAttrAccessible as String: kSecAttrAccessibleAfterFirstUnlock,
-        ]
-
-        // Try update first.
-        let updateStatus = SecItemUpdate(query as CFDictionary, attributes as CFDictionary)
-        if updateStatus == errSecSuccess { return }
-
-        if updateStatus != errSecItemNotFound {
-            // Item exists but update failed — delete and re-add to reset ACL.
-            try? self.deleteToken(dataProtection: false)
-        }
 
-        var addQuery = query
-        for (key, value) in attributes { addQuery[key] = value }
+        // Always delete-then-add to ensure SecAccess ACL is set.
+        // SecItemUpdate does NOT update the ACL, so existing items with
+        // missing or stale ACLs would continue to prompt for passwords.
+        try? self.deleteToken(dataProtection: false)
+        try? self.deleteToken(dataProtection: true)
 
-        // Grant the calling app permanent access so macOS never shows a
-        // Keychain password dialog for this item.
-        if let access = Self.createSelfAccess() {
-            addQuery[kSecAttrAccess as String] = access
-        }
+        var addQuery = self.baseQuery(dataProtection: false)
+        addQuery[kSecValueData as String] = data
+        addQuery[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock
 
         let addStatus = SecItemAdd(addQuery as CFDictionary, nil)
         guard addStatus == errSecSuccess else {
@@ -91,6 +78,7 @@ struct KeychainXAITokenStore: XAITokenStoring {
         var query = self.baseQuery(dataProtection: dataProtection)
         query[kSecMatchLimit as String] = kSecMatchLimitOne
         query[kSecReturnData as String] = true
+        query[kSecUseAuthenticationUI as String] = kSecUseAuthenticationUIFail
 
         let status = SecItemCopyMatching(query as CFDictionary, &result)
         if status == errSecItemNotFound || status == errSecInteractionNotAllowed {
@@ -126,18 +114,4 @@ struct KeychainXAITokenStore: XAITokenStoring {
         }
         return q
     }
-
-    /// Creates a SecAccess that grants the calling application permanent
-    /// read/write access without triggering the macOS Keychain password dialog.
-    private static func createSelfAccess() -> SecAccess? {
-        var trustedSelf: SecTrustedApplication?
-        guard SecTrustedApplicationCreateFromPath(nil, &trustedSelf) == errSecSuccess,
-              let trustedSelf else { return nil }
-        var access: SecAccess?
-        guard SecAccessCreate(
-            "Runic API Token" as CFString,
-            [trustedSelf] as CFArray,
-            &access) == errSecSuccess else { return nil }
-        return access
-    }
 }

package/Sources/Runic/Core/Stores/ZaiTokenStore.swift

@@ -1,5 +1,5 @@
-import RunicCore
 import Foundation
+import RunicCore
 import Security
 
 protocol ZaiTokenStoring: Sendable {
@@ -53,29 +53,16 @@ struct KeychainZaiTokenStore: ZaiTokenStoring {
         }
 
         let data = cleaned!.data(using: .utf8)!
-        let query = self.baseQuery(dataProtection: false)
-        let attributes: [String: Any] = [
-            kSecValueData as String: data,
-            kSecAttrAccessible as String: kSecAttrAccessibleAfterFirstUnlock,
-        ]
-
-        // Try update first.
-        let updateStatus = SecItemUpdate(query as CFDictionary, attributes as CFDictionary)
-        if updateStatus == errSecSuccess { return }
-
-        if updateStatus != errSecItemNotFound {
-            // Item exists but update failed — delete and re-add to reset ACL.
-            try? self.deleteToken(dataProtection: false)
-        }
 
-        var addQuery = query
-        for (key, value) in attributes { addQuery[key] = value }
+        // Always delete-then-add to ensure SecAccess ACL is set.
+        // SecItemUpdate does NOT update the ACL, so existing items with
+        // missing or stale ACLs would continue to prompt for passwords.
+        try? self.deleteToken(dataProtection: false)
+        try? self.deleteToken(dataProtection: true)
 
-        // Grant the calling app permanent access so macOS never shows a
-        // Keychain password dialog for this item.
-        if let access = Self.createSelfAccess() {
-            addQuery[kSecAttrAccess as String] = access
-        }
+        var addQuery = self.baseQuery(dataProtection: false)
+        addQuery[kSecValueData as String] = data
+        addQuery[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock
 
         let addStatus = SecItemAdd(addQuery as CFDictionary, nil)
         guard addStatus == errSecSuccess else {
@@ -91,6 +78,7 @@ struct KeychainZaiTokenStore: ZaiTokenStoring {
         var query = self.baseQuery(dataProtection: dataProtection)
         query[kSecMatchLimit as String] = kSecMatchLimitOne
         query[kSecReturnData as String] = true
+        query[kSecUseAuthenticationUI as String] = kSecUseAuthenticationUIFail
 
         let status = SecItemCopyMatching(query as CFDictionary, &result)
         if status == errSecItemNotFound || status == errSecInteractionNotAllowed {
@@ -126,18 +114,4 @@ struct KeychainZaiTokenStore: ZaiTokenStoring {
         }
         return q
     }
-
-    /// Creates a SecAccess that grants the calling application permanent
-    /// read/write access without triggering the macOS Keychain password dialog.
-    private static func createSelfAccess() -> SecAccess? {
-        var trustedSelf: SecTrustedApplication?
-        guard SecTrustedApplicationCreateFromPath(nil, &trustedSelf) == errSecSuccess,
-              let trustedSelf else { return nil }
-        var access: SecAccess?
-        guard SecAccessCreate(
-            "Runic API Token" as CFString,
-            [trustedSelf] as CFArray,
-            &access) == errSecSuccess else { return nil }
-        return access
-    }
 }

package/Sources/Runic/Core/UsageExporter.swift

@@ -25,7 +25,9 @@ enum UsageExporter {
         var lines: [String] = []
 
         // Header
-        lines.append("date,input_tokens,output_tokens,cache_creation_tokens,cache_read_tokens,total_tokens,cost_usd,models_used")
+        lines
+            .append(
+                "date,input_tokens,output_tokens,cache_creation_tokens,cache_read_tokens,total_tokens,cost_usd,models_used")
 
         // Daily summaries from token snapshot
         let daily = store.tokenSnapshot(for: provider)?.daily ?? []
@@ -45,7 +47,9 @@ enum UsageExporter {
         if daily.isEmpty, let summary = store.ledgerDailySummary(for: provider) {
             let costStr = summary.totals.costUSD.map { String(format: "%.4f", $0) } ?? ""
             let modelsStr = Self.csvEscape(summary.modelsUsed.joined(separator: "; "))
-            lines.append("\(summary.dayKey),\(summary.totals.inputTokens),\(summary.totals.outputTokens),\(summary.totals.cacheCreationTokens),\(summary.totals.cacheReadTokens),\(summary.totals.totalTokens),\(costStr),\(modelsStr)")
+            lines
+                .append(
+                    "\(summary.dayKey),\(summary.totals.inputTokens),\(summary.totals.outputTokens),\(summary.totals.cacheCreationTokens),\(summary.totals.cacheReadTokens),\(summary.totals.totalTokens),\(costStr),\(modelsStr)")
         }
 
         return lines.joined(separator: "\n")
@@ -172,8 +176,8 @@ enum UsageExporter {
         guard let data = try? JSONSerialization.data(
             withJSONObject: root,
             options: [.prettyPrinted, .sortedKeys]),
-              let string = String(data: data, encoding: .utf8) else
-        {
+            let string = String(data: data, encoding: .utf8)
+        else {
             return "{}"
         }
         return string

package/Sources/Runic/ProviderRegistry.swift

@@ -1,5 +1,5 @@
-import RunicCore
 import Foundation
+import RunicCore
 
 struct ProviderSpec {
     let style: IconStyle

package/Sources/Runic/Providers/Antigravity/AntigravityProviderImplementation.swift

@@ -1,6 +1,6 @@
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct AntigravityProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Auggie/AuggieProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct AuggieProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Azure/AzureProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct AzureProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Bedrock/BedrockProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct BedrockProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Cerebras/CerebrasProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct CerebrasProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Codex/CodexProviderImplementation.swift

@@ -1,6 +1,6 @@
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct CodexProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Cohere/CohereProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct CohereProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Cursor/CursorProviderImplementation.swift

@@ -1,6 +1,6 @@
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct CursorProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/DeepSeek/DeepSeekProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct DeepSeekProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Factory/FactoryProviderImplementation.swift

@@ -1,6 +1,6 @@
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct FactoryProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Fireworks/FireworksProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct FireworksProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Gemini/GeminiProviderImplementation.swift

@@ -1,6 +1,6 @@
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct GeminiProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Groq/GroqProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct GroqProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Kimi/KimiProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct KimiProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/MiniMax/MiniMaxProviderImplementation.swift

@@ -1,6 +1,6 @@
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct MiniMaxProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Mistral/MistralProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct MistralProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/OpenRouter/OpenRouterProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct OpenRouterProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Perplexity/PerplexityProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct PerplexityProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/SambaNova/SambaNovaProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct SambaNovaProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Shared/ProviderImplementation.swift

@@ -1,5 +1,5 @@
-import RunicCore
 import Foundation
+import RunicCore
 
 /// App-side provider implementation.
 ///
@@ -26,7 +26,10 @@ protocol ProviderImplementation: Sendable {
 }
 
 extension ProviderImplementation {
-    var supportsLoginFlow: Bool { false }
+    var supportsLoginFlow: Bool {
+        false
+    }
+
     @MainActor
     func settingsToggles(context _: ProviderSettingsContext) -> [ProviderSettingsToggleDescriptor] {
         []

package/Sources/Runic/Providers/Shared/ProviderImplementationRegistry.swift

@@ -1,5 +1,5 @@
-import RunicCore
 import Foundation
+import RunicCore
 
 enum ProviderImplementationRegistry {
     private final class Store: @unchecked Sendable {

package/Sources/Runic/Providers/Shared/ProviderSettingsDescriptors.swift

@@ -1,5 +1,5 @@
-import RunicCore
 import Foundation
+import RunicCore
 import SwiftUI
 
 /// Settings UI context passed to provider implementations.

package/Sources/Runic/Providers/Together/TogetherProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct TogetherProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/XAI/XAIProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct XAIProviderImplementation: ProviderImplementation {

package/Sources/Runic/Providers/Zai/ZaiProviderImplementation.swift

@@ -1,7 +1,7 @@
 import AppKit
+import Foundation
 import RunicCore
 import RunicMacroSupport
-import Foundation
 
 @ProviderImplementationRegistration
 struct ZaiProviderImplementation: ProviderImplementation {

package/Sources/Runic/Resources/provider-context-windows.json

@@ -0,0 +1,20 @@
+{
+  "claude": { "model": "Claude Opus 4.6", "contextK": 1000 },
+  "codex": { "model": "GPT-5 Codex", "contextK": 400 },
+  "cursor": { "model": "GPT-4o", "contextK": 128 },
+  "gemini": { "model": "Gemini 2.5 Pro", "contextK": 1000 },
+  "copilot": { "model": "GPT-4o", "contextK": 128 },
+  "zai": { "model": "GLM-4.6", "contextK": 205 },
+  "groq": { "model": "Llama 3.3 70B", "contextK": 128 },
+  "deepseek": { "model": "DeepSeek Chat", "contextK": 64 },
+  "fireworks": { "model": "Llama 3.1 70B", "contextK": 128 },
+  "mistral": { "model": "Mistral Large", "contextK": 128 },
+  "perplexity": { "model": "Sonar", "contextK": 128 },
+  "kimi": { "model": "Moonshot v1", "contextK": 128 },
+  "together": { "model": "Llama 3.1", "contextK": 128 },
+  "cohere": { "model": "Command R+", "contextK": 128 },
+  "xai": { "model": "Grok 2", "contextK": 128 },
+  "cerebras": { "model": "Llama 3.3 70B", "contextK": 128 },
+  "sambanova": { "model": "Llama 3.1 70B", "contextK": 128 },
+  "qwen": { "model": "Qwen 2.5 72B", "contextK": 128 }
+}

package/Sources/Runic/RunicApp.swift

@@ -1,8 +1,8 @@
 import AppKit
-import RunicCore
 import KeyboardShortcuts
 import Observation
 import QuartzCore
+import RunicCore
 import Security
 import SwiftUI
 
@@ -15,6 +15,8 @@ struct RunicApp: App {
     private let account: AccountInfo
 
     init() {
+        RunicTypography.registerFonts()
+
         let env = ProcessInfo.processInfo.environment
         let level = RunicLog.parseLevel(env["RUNIC_LOG_LEVEL"]) ?? .info
         RunicLog.bootstrapIfNeeded(.init(
@@ -93,7 +95,7 @@ protocol UpdaterProviding: AnyObject {
     func checkForUpdates(_ sender: Any?)
 }
 
-// No-op updater used for debug builds and non-bundled runs to suppress Sparkle dialogs.
+/// No-op updater used for debug builds and non-bundled runs to suppress Sparkle dialogs.
 final class DisabledUpdaterController: UpdaterProviding {
     var automaticallyChecksForUpdates: Bool = false
     var automaticallyDownloadsUpdates: Bool = false
@@ -149,7 +151,9 @@ final class SparkleUpdaterController: NSObject, UpdaterProviding, SPUUpdaterDele
         set { self.controller.updater.automaticallyDownloadsUpdates = newValue }
     }
 
-    var isAvailable: Bool { true }
+    var isAvailable: Bool {
+        true
+    }
 
     func checkForUpdates(_ sender: Any?) {
         self.controller.checkForUpdates(sender)
@@ -300,58 +304,64 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         self.refreshLifecycleObservers.append(center.addObserver(
             forName: NSWorkspace.willSleepNotification,
             object: nil,
-            queue: .main) { [weak self] _ in
-                Task { @MainActor [weak self] in
-                    self?.store?.handleAutoRefreshSystemPause(.systemSleep)
-                }
-            })
+            queue: .main)
+        { [weak self] _ in
+            Task { @MainActor [weak self] in
+                self?.store?.handleAutoRefreshSystemPause(.systemSleep)
+            }
+        })
 
         self.refreshLifecycleObservers.append(center.addObserver(
             forName: NSWorkspace.didWakeNotification,
             object: nil,
-            queue: .main) { [weak self] _ in
-                Task { @MainActor [weak self] in
-                    self?.store?.setAutoRefreshSuspended(nil)
-                    await self?.store?.refresh(trigger: .resume)
-                }
-            })
+            queue: .main)
+        { [weak self] _ in
+            Task { @MainActor [weak self] in
+                self?.store?.setAutoRefreshSuspended(nil)
+                await self?.store?.refresh(trigger: .resume)
+            }
+        })
 
         self.refreshLifecycleObservers.append(center.addObserver(
             forName: NSWorkspace.screensDidSleepNotification,
             object: nil,
-            queue: .main) { [weak self] _ in
-                Task { @MainActor [weak self] in
-                    self?.store?.handleAutoRefreshSystemPause(.screenSleep)
-                }
-            })
+            queue: .main)
+        { [weak self] _ in
+            Task { @MainActor [weak self] in
+                self?.store?.handleAutoRefreshSystemPause(.screenSleep)
+            }
+        })
 
         self.refreshLifecycleObservers.append(center.addObserver(
             forName: NSWorkspace.screensDidWakeNotification,
             object: nil,
-            queue: .main) { [weak self] _ in
-                Task { @MainActor [weak self] in
-                    self?.store?.setAutoRefreshSuspended(nil)
-                    await self?.store?.refresh(trigger: .resume)
-                }
-            })
+            queue: .main)
+        { [weak self] _ in
+            Task { @MainActor [weak self] in
+                self?.store?.setAutoRefreshSuspended(nil)
+                await self?.store?.refresh(trigger: .resume)
+            }
+        })
 
         self.refreshLifecycleObservers.append(center.addObserver(
             forName: NSWorkspace.sessionDidResignActiveNotification,
             object: nil,
-            queue: .main) { [weak self] _ in
-                Task { @MainActor [weak self] in
-                    self?.store?.handleAutoRefreshSystemPause(.sessionInactive)
-                }
-            })
+            queue: .main)
+        { [weak self] _ in
+            Task { @MainActor [weak self] in
+                self?.store?.handleAutoRefreshSystemPause(.sessionInactive)
+            }
+        })
 
         self.refreshLifecycleObservers.append(center.addObserver(
             forName: NSWorkspace.sessionDidBecomeActiveNotification,
             object: nil,
-            queue: .main) { [weak self] _ in
-                Task { @MainActor [weak self] in
-                    self?.store?.setAutoRefreshSuspended(nil)
-                    await self?.store?.refresh(trigger: .resume)
-                }
-            })
+            queue: .main)
+        { [weak self] _ in
+            Task { @MainActor [weak self] in
+                self?.store?.setAutoRefreshSuspended(nil)
+                await self?.store?.refresh(trigger: .resume)
+            }
+        })
     }
 }