@sriinnu/runic 1.2.0 → 2.0.0

package/Sources/RunicCore/UsageFormatter.swift

@@ -97,7 +97,7 @@ public enum UsageFormatter {
         guard tokenCount > 0 else { return nil }
         let rate = costUSD / (Double(tokenCount) / 1000.0)
         guard rate.isFinite, rate >= 0 else { return nil }
-        return "\(usdRateString(rate))/1K"
+        return "\(self.usdRateString(rate))/1K"
     }
 
     public static func usdPerRequestString(costUSD: Double?, requestCount: Int) -> String? {
@@ -105,7 +105,7 @@ public enum UsageFormatter {
         guard requestCount > 0 else { return nil }
         let rate = costUSD / Double(requestCount)
         guard rate.isFinite, rate >= 0 else { return nil }
-        return "\(usdRateString(rate))/req"
+        return "\(self.usdRateString(rate))/req"
     }
 
     public static func usdPerHourFromTokensString(
@@ -120,7 +120,7 @@ public enum UsageFormatter {
         guard per1KValue.isFinite, per1KValue >= 0 else { return nil }
         let hourly = per1KValue * (tokensPerMinute * 60.0 / 1000.0)
         guard hourly.isFinite, hourly >= 0 else { return nil }
-        return "\(usdRateString(hourly))/hr"
+        return "\(self.usdRateString(hourly))/hr"
     }
 
     public static func currencyString(_ value: Double, currencyCode: String) -> String {
@@ -164,21 +164,21 @@ public enum UsageFormatter {
     }
 
     public static func tokenSummaryString(_ totals: UsageLedgerTotals, includeBreakdown: Bool = true) -> String {
-        let total = tokenCountString(totals.totalTokens)
+        let total = self.tokenCountString(totals.totalTokens)
         guard includeBreakdown else {
             return "\(total) tok"
         }
 
         var parts: [String] = []
         if totals.inputTokens > 0 {
-            parts.append("in \(tokenCountString(totals.inputTokens))")
+            parts.append("in \(self.tokenCountString(totals.inputTokens))")
         }
         if totals.outputTokens > 0 {
-            parts.append("out \(tokenCountString(totals.outputTokens))")
+            parts.append("out \(self.tokenCountString(totals.outputTokens))")
         }
         let cached = totals.cacheCreationTokens + totals.cacheReadTokens
         if cached > 0 {
-            parts.append("cache \(tokenCountString(cached))")
+            parts.append("cache \(self.tokenCountString(cached))")
         }
         guard !parts.isEmpty else { return "\(total) tok" }
         return "\(total) tok (\(parts.joined(separator: ", ")))"
@@ -248,8 +248,8 @@ public enum UsageFormatter {
     /// Returns a human-friendly context window label for a model when known.
     /// Examples: "ctx 128k", "ctx 1M".
     public static func modelContextLabel(for model: String) -> String? {
-        guard let context = Self.modelContextWindow(for: model) else { return nil }
-        return "ctx \(tokenCountString(context))"
+        guard let context = modelContextWindow(for: model) else { return nil }
+        return "ctx \(self.tokenCountString(context))"
     }
 
     /// Resolves an approximate context window (in tokens) for common model families.
@@ -285,7 +285,7 @@ public enum UsageFormatter {
         "gpt-4o-mini": 128_000,
         "gpt-4-turbo": 128_000,
         "gpt-4": 128_000,
-        "gpt-3.5-turbo": 16_385,
+        "gpt-3.5-turbo": 16385,
         "gpt-4.1": 1_000_000,
         "gpt-4.1-mini": 1_000_000,
         "gpt-4.1-nano": 1_000_000,
@@ -315,33 +315,33 @@ public enum UsageFormatter {
         "llama-3-1-8b": 128_000,
         "llama-3-3-70b": 128_000,
         "mistral-large": 128_000,
-        "mistral-small": 32_000,
+        "mistral-small": 32000,
         "mistral-medium": 131_072,
-        "deepseek-chat": 64_000,
-        "deepseek-coder": 32_000,
+        "deepseek-chat": 64000,
+        "deepseek-coder": 32000,
         "cohere-command": 128_000,
         "cohere-command-r": 128_000,
         "cohere-command-r-plus": 128_000,
         "qwen-2-5-72b": 128_000,
         "qwen-2-5-32b": 128_000,
-        "qwen1-5-32b": 8_192,
-        "qwen1-5-14b": 8_192,
+        "qwen1-5-32b": 8192,
+        "qwen1-5-14b": 8192,
         "grok-2": 128_000,
         "grok-2-mini": 131_072,
         "grok-2-vision": 131_072,
-        "mixtral-8x7b": 32_768,
-        "mixtral-8x22b": 64_000,
-        "llama-3-8b": 8_192,
-        "llama-3-70b": 8_192,
-        "llama-2-70b": 4_096,
-        "llama-2-13b": 4_096,
+        "mixtral-8x7b": 32768,
+        "mixtral-8x22b": 64000,
+        "llama-3-8b": 8192,
+        "llama-3-70b": 8192,
+        "llama-2-70b": 4096,
+        "llama-2-13b": 4096,
     ]
 
     private static let modelContextPrefixes: [(String, Int)] = [
         ("gpt-4.1", 1_000_000),
         ("gpt-4o", 128_000),
         ("gpt-4-", 128_000),
-        ("gpt-3.5", 16_385),
+        ("gpt-3.5", 16385),
         ("gpt-5", 400_000),
         ("gpt-5-", 400_000),
         ("claude-3", 200_000),
@@ -351,9 +351,9 @@ public enum UsageFormatter {
         ("gemini-1-5", 1_000_000),
         ("gemini-2-0", 1_000_000),
         ("gemini-2-5", 1_000_000),
-        ("llama-3", 8_192),
+        ("llama-3", 8192),
         ("qwen-2-5", 128_000),
-        ("qwen1-5", 8_192),
+        ("qwen1-5", 8192),
     ]
 
     private static func normalizedModelIdentifier(for model: String) -> String {
@@ -370,7 +370,7 @@ public enum UsageFormatter {
         for token in tokens.reversed() {
             let lower = token.lowercased()
             if lower.hasSuffix("k"), let numeric = Int(lower.dropLast()), numeric > 0 {
-                return numeric * 1_000
+                return numeric * 1000
             }
             if lower.hasSuffix("m"), let numeric = Int(lower.dropLast()), numeric > 0 {
                 return numeric * 1_000_000

package/Sources/RunicCore/UsageLedger/ClaudeUsageLogSource.swift

@@ -56,7 +56,9 @@ public struct ClaudeUsageLogSource: UsageLedgerSource, @unchecked Sendable {
         // Filter to only files modified since last scan (plus today's files which may have grown).
         let todayStart = Calendar.current.startOfDay(for: self.now)
         let filesToScan = allFiles.filter { file in
-            guard let modDate = (try? self.fileManager.attributesOfItem(atPath: file.url.path))?[.modificationDate] as? Date else {
+            guard let modDate = (try? self.fileManager
+                .attributesOfItem(atPath: file.url.path))?[.modificationDate] as? Date
+            else {
                 return true
             }
             return modDate >= incrementalCutoff || modDate >= todayStart
@@ -66,7 +68,9 @@ public struct ClaudeUsageLogSource: UsageLedgerSource, @unchecked Sendable {
             return []
         }
 
-        self.log.info("Scanning \(filesToScan.count) of \(allFiles.count) JSONL files (incremental since \(incrementalCutoff))")
+        self.log
+            .info(
+                "Scanning \(filesToScan.count) of \(allFiles.count) JSONL files (incremental since \(incrementalCutoff))")
 
         // Parse files concurrently (max 16 at a time).
         let maxConcurrency = 16
@@ -118,7 +122,14 @@ public struct ClaudeUsageLogSource: UsageLedgerSource, @unchecked Sendable {
         dailyFormatter.dateFormat = "yyyy-MM-dd"
         dailyFormatter.timeZone = .current
 
-        var dailyBuckets: [String: (input: Int, output: Int, cacheCreate: Int, cacheRead: Int, cost: Double, requests: Int, models: Set<String>)] = [:]
+        var dailyBuckets: [String: (
+            input: Int,
+            output: Int,
+            cacheCreate: Int,
+            cacheRead: Int,
+            cost: Double,
+            requests: Int,
+            models: Set<String>)] = [:]
         for entry in entries {
             let key = dailyFormatter.string(from: entry.timestamp)
             var bucket = dailyBuckets[key] ?? (0, 0, 0, 0, 0, 0, [])
@@ -188,24 +199,22 @@ public struct ClaudeUsageLogSource: UsageLedgerSource, @unchecked Sendable {
 
         var candidates: [URL] = []
         if !envPaths.isEmpty {
-            candidates = envPaths.map { expandTilde(path: String($0)) }
+            candidates = envPaths.map { self.expandTilde(path: String($0)) }
         } else {
-            let home = fileManager.homeDirectoryForCurrentUser
+            let home = self.fileManager.homeDirectoryForCurrentUser
             candidates = [
                 home.appendingPathComponent(".config/claude", isDirectory: true),
                 home.appendingPathComponent(".claude", isDirectory: true),
             ]
         }
 
-        let projectsDirs = candidates
+        return candidates
             .map { $0.appendingPathComponent("projects", isDirectory: true) }
             .filter { self.fileManager.directoryExists(at: $0) }
-
-        return projectsDirs
     }
 
     private func normalizePaths(_ urls: [URL]) -> [URL] {
-        urls.map { $0.standardizedFileURL }
+        urls.map(\.standardizedFileURL)
             .filter { self.fileManager.directoryExists(at: $0) }
             .map { $0.appendingPathComponent("projects", isDirectory: true) }
             .filter { self.fileManager.directoryExists(at: $0) }
@@ -236,7 +245,11 @@ public struct ClaudeUsageLogSource: UsageLedgerSource, @unchecked Sendable {
                 let projectID = pathComponents[projectsIndex + 1]
                 let projectName = self.derivedProjectName(from: projectID)
                 let sessionID = pathComponents[projectsIndex + 2]
-                results.append(UsageFile(url: fileURL, projectID: projectID, projectName: projectName, sessionID: sessionID))
+                results.append(UsageFile(
+                    url: fileURL,
+                    projectID: projectID,
+                    projectName: projectName,
+                    sessionID: sessionID))
             }
         }
 
@@ -355,7 +368,7 @@ public struct ClaudeUsageLogSource: UsageLedgerSource, @unchecked Sendable {
 
     private func expandTilde(path: String) -> URL {
         if path.hasPrefix("~/") {
-            let home = fileManager.homeDirectoryForCurrentUser
+            let home = self.fileManager.homeDirectoryForCurrentUser
             let trimmed = String(path.dropFirst(2))
             return home.appendingPathComponent(trimmed, isDirectory: true)
         }
@@ -410,6 +423,7 @@ private final class ClaudeISO8601FormatterBox: @unchecked Sendable {
         formatter.formatOptions = [.withInternetDateTime]
         return formatter
     }()
+
     let fractional: ISO8601DateFormatter = {
         let formatter = ISO8601DateFormatter()
         formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
@@ -419,8 +433,8 @@ private final class ClaudeISO8601FormatterBox: @unchecked Sendable {
 
 private let claudeISOFormatterBox = ClaudeISO8601FormatterBox()
 
-private extension FileManager {
-    func directoryExists(at url: URL) -> Bool {
+extension FileManager {
+    fileprivate func directoryExists(at url: URL) -> Bool {
         var isDir: ObjCBool = false
         return self.fileExists(atPath: url.path, isDirectory: &isDir) && isDir.boolValue
     }

package/Sources/RunicCore/UsageLedger/CodexUsageLogSource.swift

@@ -123,7 +123,14 @@ public struct CodexUsageLogSource: UsageLedgerSource, @unchecked Sendable {
         dailyFormatter.dateFormat = "yyyy-MM-dd"
         dailyFormatter.timeZone = .current
 
-        var dailyBuckets: [String: (input: Int, output: Int, cacheCreate: Int, cacheRead: Int, cost: Double, requests: Int, models: Set<String>)] = [:]
+        var dailyBuckets: [String: (
+            input: Int,
+            output: Int,
+            cacheCreate: Int,
+            cacheRead: Int,
+            cost: Double,
+            requests: Int,
+            models: Set<String>)] = [:]
         for entry in entries {
             let key = dailyFormatter.string(from: entry.timestamp)
             var bucket = dailyBuckets[key] ?? (0, 0, 0, 0, 0, 0, [])
@@ -477,6 +484,7 @@ private final class CodexISO8601FormatterBox: @unchecked Sendable {
         formatter.formatOptions = [.withInternetDateTime]
         return formatter
     }()
+
     let fractional: ISO8601DateFormatter = {
         let formatter = ISO8601DateFormatter()
         formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
@@ -486,8 +494,8 @@ private final class CodexISO8601FormatterBox: @unchecked Sendable {
 
 private let codexISOFormatterBox = CodexISO8601FormatterBox()
 
-private extension FileManager {
-    func directoryExists(at url: URL) -> Bool {
+extension FileManager {
+    fileprivate func directoryExists(at url: URL) -> Bool {
         var isDir: ObjCBool = false
         return self.fileExists(atPath: url.path, isDirectory: &isDir) && isDir.boolValue
     }

package/Sources/RunicCore/UsageLedger/LedgerCache.swift

@@ -49,7 +49,10 @@ public actor LedgerCache {
     /// - Today's entry is ACCUMULATED (adds to existing totals for partial scans)
     /// - New days are appended
     public func mergeDailies(provider: String, newDailies: [CachedDaily], scanDate: Date, todayKey: String? = nil) {
-        var ledger = self.loadCachedDailies(provider: provider) ?? CachedLedger(lastScanDate: scanDate, lastFullScanDate: nil, dailies: [])
+        var ledger = self.loadCachedDailies(provider: provider) ?? CachedLedger(
+            lastScanDate: scanDate,
+            lastFullScanDate: nil,
+            dailies: [])
 
         let resolvedTodayKey = todayKey ?? Self.dayKey(for: Date())
         var existingByKey: [String: CachedDaily] = [:]
@@ -119,7 +122,7 @@ public struct CachedLedger: Codable, Sendable {
 }
 
 public struct CachedDaily: Codable, Sendable {
-    public let dayKey: String          // "2026-03-23"
+    public let dayKey: String // "2026-03-23"
     public let inputTokens: Int
     public let outputTokens: Int
     public let cacheCreationTokens: Int

package/Sources/RunicCore/UsageLedger/OTelGenAILedgerAdapter.swift

@@ -29,7 +29,7 @@ public enum OTelGenAILedgerAdapterError: LocalizedError, Sendable, Equatable {
         switch self {
         case .invalidUTF8:
             "OTel payload is not valid UTF-8."
-        case .invalidJSON(let message):
+        case let .invalidJSON(message):
             "OTel JSON parse failed: \(message)"
         }
     }

package/Sources/RunicCore/UsageLedger/UsageLedgerAggregator.swift

@@ -46,7 +46,7 @@ public enum UsageLedgerAggregator {
         timeZone: TimeZone,
         groupByProject: Bool = true) -> [UsageLedgerDailySummary]
     {
-        let calendar = calendarFor(timeZone)
+        let calendar = self.calendarFor(timeZone)
         var buckets: [DailyKey: AggregateAccumulator] = [:]
 
         for entry in entries {
@@ -59,7 +59,7 @@ public enum UsageLedgerAggregator {
         }
 
         return buckets.map { key, acc in
-            let dayKey = dayKeyString(from: key.dayStart, timeZone: timeZone)
+            let dayKey = self.dayKeyString(from: key.dayStart, timeZone: timeZone)
             return UsageLedgerDailySummary(
                 provider: key.provider,
                 projectID: key.projectID,
@@ -138,7 +138,10 @@ public enum UsageLedgerAggregator {
                 let isActive = now <= blockEnd && now.timeIntervalSince(lastTimestamp) <= blockDuration
                 let acc = AggregateAccumulator(entries: currentEntries)
                 let tokensPerMinute = isActive ? acc.tokensPerMinute(since: currentStart, now: now) : nil
-                let projected = isActive ? acc.projectedTotalTokens(since: currentStart, now: now, duration: blockDuration) : nil
+                let projected = isActive ? acc.projectedTotalTokens(
+                    since: currentStart,
+                    now: now,
+                    duration: blockDuration) : nil
                 summaries.append(UsageLedgerBlockSummary(
                     provider: key.provider,
                     sessionID: key.sessionID,
@@ -283,7 +286,7 @@ public enum UsageLedgerAggregator {
         groupByProject: Bool) -> [UsageLedgerSpendForecast]
     {
         guard projectionDays > 0 else { return [] }
-        let calendar = calendarFor(timeZone)
+        let calendar = self.calendarFor(timeZone)
         var buckets: [SpendForecastKey: SpendForecastAccumulator] = [:]
 
         for entry in entries {
@@ -334,7 +337,7 @@ public enum UsageLedgerAggregator {
 
     private static func dayKeyString(from date: Date, timeZone: TimeZone) -> String {
         let formatter = DateFormatter()
-        formatter.calendar = calendarFor(timeZone)
+        formatter.calendar = self.calendarFor(timeZone)
         formatter.locale = Locale(identifier: "en_US_POSIX")
         formatter.timeZone = timeZone
         formatter.dateFormat = "yyyy-MM-dd"
@@ -343,7 +346,7 @@ public enum UsageLedgerAggregator {
 
     private static func hourKeyString(from date: Date, timeZone: TimeZone) -> String {
         let formatter = DateFormatter()
-        formatter.calendar = calendarFor(timeZone)
+        formatter.calendar = self.calendarFor(timeZone)
         formatter.locale = Locale(identifier: "en_US_POSIX")
         formatter.timeZone = timeZone
         formatter.dateFormat = "yyyy-MM-dd'T'HH:00:00"
@@ -355,7 +358,7 @@ public enum UsageLedgerAggregator {
         timeZone: TimeZone,
         groupByProject: Bool = true) -> [UsageLedgerHourlySummary]
     {
-        let calendar = calendarFor(timeZone)
+        let calendar = self.calendarFor(timeZone)
         var buckets: [HourlyKey: AggregateAccumulator] = [:]
 
         for entry in entries {
@@ -371,7 +374,7 @@ public enum UsageLedgerAggregator {
         }
 
         return buckets.map { key, acc in
-            let hourKey = hourKeyString(from: key.hourStart, timeZone: timeZone)
+            let hourKey = self.hourKeyString(from: key.hourStart, timeZone: timeZone)
             return UsageLedgerHourlySummary(
                 provider: key.provider,
                 projectID: key.projectID,
@@ -445,7 +448,10 @@ private struct AggregateAccumulator {
         self.modelSet.sorted()
     }
 
-    private mutating func mergeProjectIdentity(from identity: UsageLedgerProjectIdentity?, fallbackEntry: UsageLedgerEntry) {
+    private mutating func mergeProjectIdentity(
+        from identity: UsageLedgerProjectIdentity?,
+        fallbackEntry: UsageLedgerEntry)
+    {
         if let key = identity?.key, self.projectKey == nil {
             self.projectKey = key
         }
@@ -468,17 +474,16 @@ private struct AggregateAccumulator {
         let candidateProvenance = identity?.provenance
 
         guard let candidateName, !candidateName.isEmpty else { return }
-        let shouldAdopt: Bool
-        if self.projectName == nil {
-            shouldAdopt = true
+        let shouldAdopt = if self.projectName == nil {
+            true
         } else if candidateConfidence.rank > self.projectNameConfidence.rank {
-            shouldAdopt = true
+            true
         } else if candidateConfidence.rank == self.projectNameConfidence.rank,
                   candidateName.count > (self.projectName?.count ?? 0)
         {
-            shouldAdopt = true
+            true
         } else {
-            shouldAdopt = false
+            false
         }
 
         if shouldAdopt {
@@ -586,7 +591,10 @@ private struct SpendForecastAccumulator {
         return lowerValue + ((upperValue - lowerValue) * weight)
     }
 
-    private mutating func mergeProjectIdentity(from identity: UsageLedgerProjectIdentity?, fallbackEntry: UsageLedgerEntry) {
+    private mutating func mergeProjectIdentity(
+        from identity: UsageLedgerProjectIdentity?,
+        fallbackEntry: UsageLedgerEntry)
+    {
         if self.projectID == nil {
             let preferredID = identity?.projectID?.trimmingCharacters(in: .whitespacesAndNewlines)
             if let preferredID, !preferredID.isEmpty {
@@ -605,17 +613,16 @@ private struct SpendForecastAccumulator {
         let candidateProvenance = identity?.provenance
 
         guard let candidateName, !candidateName.isEmpty else { return }
-        let shouldAdopt: Bool
-        if self.projectName == nil {
-            shouldAdopt = true
+        let shouldAdopt = if self.projectName == nil {
+            true
         } else if candidateConfidence.rank > self.projectNameConfidence.rank {
-            shouldAdopt = true
+            true
         } else if candidateConfidence.rank == self.projectNameConfidence.rank,
                   candidateName.count > (self.projectName?.count ?? 0)
         {
-            shouldAdopt = true
+            true
         } else {
-            shouldAdopt = false
+            false
         }
 
         if shouldAdopt {
@@ -654,7 +661,15 @@ private struct SessionAccumulator {
         }
     }
 
-    var totals: UsageLedgerTotals { self.aggregate.totals }
-    var models: [String] { self.modelSet.sorted() }
-    var versions: [String] { self.versionSet.sorted() }
+    var totals: UsageLedgerTotals {
+        self.aggregate.totals
+    }
+
+    var models: [String] {
+        self.modelSet.sorted()
+    }
+
+    var versions: [String] {
+        self.versionSet.sorted()
+    }
 }

package/Sources/RunicCore/UsageLedger/UsageLedgerInsightsAdvisor.swift

@@ -97,7 +97,7 @@ public enum UsageLedgerInsightsAdvisor {
             score -= 10
             signals.append("No project-level grouping is available.")
         } else {
-            let unknownProjects = projectBreakdown.filter { $0.displayProjectName == "Unknown project" }.count
+            let unknownProjects = projectBreakdown.count(where: { $0.displayProjectName == "Unknown project" })
             let unknownRatio = Double(unknownProjects) / Double(max(1, projectBreakdown.count))
             if unknownRatio > 0.40 {
                 score -= 10

package/Sources/RunicCore/UsageLedger/UsageLedgerProjectIdentity.swift

@@ -60,11 +60,11 @@ public enum UsageLedgerProjectIdentityResolver {
         projectName: String?,
         budgetNameOverride: String? = nil) -> UsageLedgerProjectIdentity
     {
-        let normalizedProjectID = normalizedIdentifier(projectID)
-        let normalizedProjectName = normalizedDisplay(projectName)
-        let budgetName = normalizedDisplay(budgetNameOverride)
-        let workspaceCandidate = firstPathLikeValue(candidates: [projectID, projectName])
-        let workspaceHash = workspaceCandidate.map(stablePathHash)
+        let normalizedProjectID = self.normalizedIdentifier(projectID)
+        let normalizedProjectName = self.normalizedDisplay(projectName)
+        let budgetName = self.normalizedDisplay(budgetNameOverride)
+        let workspaceCandidate = self.firstPathLikeValue(candidates: [projectID, projectName])
+        let workspaceHash = workspaceCandidate.map(self.stablePathHash)
         let workspaceSuffix = workspaceHash.map { "#w:\($0.prefix(8))" } ?? ""
 
         var displayName: String?
@@ -103,7 +103,7 @@ public enum UsageLedgerProjectIdentityResolver {
         if let normalizedProjectID {
             key = "id:\(normalizedProjectID.lowercased())\(workspaceSuffix)"
         } else if let seed = displayName {
-            let slug = slugify(seed)
+            let slug = self.slugify(seed)
             key = slug.isEmpty ? nil : "name:\(slug)\(workspaceSuffix)"
         } else {
             key = nil
@@ -129,11 +129,11 @@ public enum UsageLedgerProjectIdentityResolver {
         if normalized.contains("/") || normalized.contains("\\") {
             return nil
         }
-        return readableIdentifier(normalized)
+        return self.readableIdentifier(normalized)
     }
 
     private static func normalizedIdentifier(_ value: String?) -> String? {
-        let cleaned = normalizedDisplay(value)
+        let cleaned = self.normalizedDisplay(value)
         guard let cleaned, !cleaned.isEmpty else { return nil }
         return cleaned
     }
@@ -149,6 +149,43 @@ public enum UsageLedgerProjectIdentityResolver {
 
     private static func inferredPathTail(from value: String?) -> String? {
         guard let value else { return nil }
+
+        // Claude Code uses dash-separated path IDs like "-Users-srinivaspendela-Sriinnu-AI-Runic".
+        // Extract the last meaningful segment(s) as the project name.
+        if value.hasPrefix("-Users-") || value.hasPrefix("-home-") {
+            let parts = value.split(separator: "-").map(String.init)
+            // Find the last non-user-path segment — skip Users, username, common dirs
+            let skipPrefixes: Set = [
+                "Users",
+                "home",
+                "Documents",
+                "Desktop",
+                "Projects",
+                "Personal",
+                "repos",
+                "code",
+                "src",
+                "dev",
+                "Work",
+                "Sites",
+            ]
+            var meaningful: [String] = []
+            var pastUserPath = false
+            for part in parts where !part.isEmpty {
+                if !pastUserPath {
+                    if skipPrefixes.contains(part) || part.count <= 2 { continue }
+                    pastUserPath = true
+                }
+                meaningful.append(part)
+            }
+            // Take the last 1-2 segments as the project name
+            if meaningful.count >= 2 {
+                return meaningful.suffix(2).joined(separator: "/")
+            } else if let last = meaningful.last {
+                return last
+            }
+        }
+
         let separators = CharacterSet(charactersIn: "/\\")
         guard value.rangeOfCharacter(from: separators) != nil else { return nil }
 
@@ -156,23 +193,23 @@ public enum UsageLedgerProjectIdentityResolver {
             ch == "/" || ch == "\\"
         }
         guard let last = parts.last else { return nil }
-        let tail = normalizedDisplay(String(last))
+        let tail = self.normalizedDisplay(String(last))
         guard let tail else { return nil }
-        guard !looksOpaqueIdentifier(tail) else { return nil }
+        guard !self.looksOpaqueIdentifier(tail) else { return nil }
         return tail
     }
 
     private static func readableIdentifier(_ value: String?) -> String? {
         guard let value else { return nil }
         guard !value.isEmpty else { return nil }
-        guard !looksOpaqueIdentifier(value) else { return nil }
+        guard !self.looksOpaqueIdentifier(value) else { return nil }
         return value
     }
 
     private static func inferredNameToken(from value: String?) -> String? {
-        let normalized = normalizedDisplay(value)
+        let normalized = self.normalizedDisplay(value)
         guard let normalized, !normalized.isEmpty else { return nil }
-        let slug = slugify(normalized)
+        let slug = self.slugify(normalized)
         guard !slug.isEmpty else { return nil }
         let titleCased = slug.split(separator: "-")
             .map { token -> String in
@@ -197,7 +234,9 @@ public enum UsageLedgerProjectIdentityResolver {
     }
 
     private static func slugify(_ value: String) -> String {
-        let folded = value.folding(options: [.diacriticInsensitive, .caseInsensitive, .widthInsensitive], locale: .init(identifier: "en_US_POSIX"))
+        let folded = value.folding(
+            options: [.diacriticInsensitive, .caseInsensitive, .widthInsensitive],
+            locale: .init(identifier: "en_US_POSIX"))
         var scalarBuffer: [UnicodeScalar] = []
         scalarBuffer.reserveCapacity(folded.unicodeScalars.count)
 
@@ -235,10 +274,10 @@ public enum UsageLedgerProjectIdentityResolver {
 
     private static func stablePathHash(_ value: String) -> String {
         let normalized = value.lowercased()
-        var hash: UInt64 = 0xcbf29ce484222325
+        var hash: UInt64 = 0xCBF2_9CE4_8422_2325
         for byte in normalized.utf8 {
             hash ^= UInt64(byte)
-            hash = hash &* 0x100000001b3
+            hash = hash &* 0x100_0000_01B3
         }
         return String(format: "%016llx", hash)
     }

package/Sources/RunicCore/Vendored/CostUsage/CostUsageCache.swift

@@ -43,21 +43,21 @@ enum CostUsageCacheIO {
     }
 }
 
-struct CostUsageCache: Codable, Sendable {
+struct CostUsageCache: Codable {
     var version: Int = 1
     var lastScanUnixMs: Int64 = 0
 
-    // filePath -> file usage
+    /// filePath -> file usage
     var files: [String: CostUsageFileUsage] = [:]
 
-    // dayKey -> model -> packed usage
+    /// dayKey -> model -> packed usage
     var days: [String: [String: [Int]]] = [:]
 
-    // rootPath -> mtime (for Claude roots)
+    /// rootPath -> mtime (for Claude roots)
     var roots: [String: Int64]?
 }
 
-struct CostUsageFileUsage: Codable, Sendable {
+struct CostUsageFileUsage: Codable {
     var mtimeUnixMs: Int64
     var size: Int64
     var days: [String: [String: [Int]]]
@@ -66,7 +66,7 @@ struct CostUsageFileUsage: Codable, Sendable {
     var lastTotals: CostUsageCodexTotals?
 }
 
-struct CostUsageCodexTotals: Codable, Sendable {
+struct CostUsageCodexTotals: Codable {
     var input: Int
     var cached: Int
     var output: Int

package/Sources/RunicCore/Vendored/CostUsage/CostUsageJsonl.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 enum CostUsageJsonl {
-    struct Line: Sendable {
+    struct Line {
         let bytes: Data
         let wasTruncated: Bool
     }