Fix unknown Codex model attribution (#2061)

* Fix unknown Codex model attribution

* Normalize Codex model evidence

* Preserve Codex turn model precedence

* test: align Codex model attribution contract

---------

Co-authored-by: Peter Steinberger <steipete@gmail.com>

Author: hhh2210

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Settings: split provider pane "Settings" sections into "Menu bar" and "Connection" so metric pickers and auth/cookie/source controls are grouped by topic.
 
 ### Fixed
+- Codex cost history: keep model-less token events explicitly unattributed instead of pricing them as GPT-5 while preserving current turn model attribution. Thanks @hhh2210!
 - Gemini: recover expired Workspace and education OAuth sessions when current CLI packages omit `oauth2.js`, with explicit credential and install-path discovery fallbacks. Thanks @Yuxin-Qiao!
 - Codex accounts: confirm apparent weekly resets before publishing them and isolate reset detection by stable account ownership, preventing transient full gauges and confetti across same-email workspaces (#2054). Thanks @Yuxin-Qiao!
 - Settings: render section footer captions (Advanced keychain note, refresh hints, quota-warning and provider subtitles) leading-aligned in footnote size instead of the trailing-aligned body text macOS gives bare form footers.

Sources/CodexBarCore/Generated/CodexParserHash.generated.swift

@@ -1,5 +1,5 @@
 // Generated by Scripts/regenerate-codex-parser-hash.sh. Do not edit by hand.
 
 enum CodexParserHash {
-    static let value = "4cf70ccd355c42ac"
+    static let value = "96b33540df97223f"
 }

Sources/CodexBarCore/UsageFormatter.swift

@@ -364,6 +364,7 @@ public enum UsageFormatter {
     public static func modelDisplayName(_ raw: String) -> String {
         var cleaned = raw.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !cleaned.isEmpty else { return raw }
+        if cleaned == "unknown" { return "Unknown model" }
 
         let patterns = [
             #"(?:-|\s)\d{8}$"#,

Sources/CodexBarCore/Vendored/CostUsage/CostUsageCache.swift

@@ -9,7 +9,7 @@ enum CostUsageCacheIO {
     private static func artifactVersion(for provider: UsageProvider) -> Int {
         switch provider {
         case .codex:
-            8
+            9
         case .claude, .vertexai:
             4
         default:

Sources/CodexBarCore/Vendored/CostUsage/CostUsageScanner.swift

@@ -8,6 +8,8 @@ import Foundation
 
 // swiftlint:disable type_body_length file_length
 enum CostUsageScanner {
+    static let codexUnknownModel = "unknown"
+
     static let codexProjectMetadataVersion = 1
     typealias CancellationCheck = () throws -> Void
 
@@ -1054,6 +1056,11 @@ enum CostUsageScanner {
     private static let codexJSONFieldType = Array("type".utf8)
     private static let codexJSONFieldCwd = Array("cwd".utf8)
 
+    static func codexModelEvidence(_ raw: String?) -> String? {
+        guard let trimmed = raw?.trimmingCharacters(in: .whitespacesAndNewlines), !trimmed.isEmpty else { return nil }
+        return trimmed
+    }
+
     private static func codexForkParentId(from payload: [String: Any]?) -> String? {
         guard let payload else { return nil }
         for key in ["forked_from_id", "forkedFromId", "parent_session_id", "parentSessionId"] {
@@ -1268,26 +1275,26 @@ enum CostUsageScanner {
                           atDepth: 1)
                 else { return nil }
 
-                let model = Self.extractJSONByteStringField(
+                let model = Self.codexModelEvidence(Self.extractJSONByteStringField(
                     Self.codexJSONFieldModel,
                     from: rawBuffer,
                     in: infoRange,
-                    atDepth: 1)
-                    ?? Self.extractJSONByteStringField(
+                    atDepth: 1))
+                    ?? Self.codexModelEvidence(Self.extractJSONByteStringField(
                         Self.codexJSONFieldModelName,
                         from: rawBuffer,
                         in: infoRange,
-                        atDepth: 1)
-                    ?? Self.extractJSONByteStringField(
+                        atDepth: 1))
+                    ?? Self.codexModelEvidence(Self.extractJSONByteStringField(
                         Self.codexJSONFieldModel,
                         from: rawBuffer,
                         in: payloadRange,
-                        atDepth: 1)
-                    ?? Self.extractJSONByteStringField(
+                        atDepth: 1))
+                    ?? Self.codexModelEvidence(Self.extractJSONByteStringField(
                         Self.codexJSONFieldModel,
                         from: rawBuffer,
                         in: objectRange,
-                        atDepth: 1)
+                        atDepth: 1))
                 let total = Self.codexTotals(
                     from: rawBuffer,
                     in: Self.extractJSONByteObjectField(
@@ -1707,7 +1714,9 @@ enum CostUsageScanner {
             guard let dayKey = Self.dayKeyFromTimestamp(record.timestamp) ?? Self.dayKeyFromParsedISO(record.timestamp)
             else { return }
 
-            let model = currentModel ?? record.model ?? "gpt-5"
+            let model = Self.codexModelEvidence(currentModel)
+                ?? Self.codexModelEvidence(record.model)
+                ?? Self.codexUnknownModel
             let total = record.total
             let last = record.last
 
@@ -2030,11 +2039,13 @@ enum CostUsageScanner {
                         guard (payload["type"] as? String) == "token_count" else { return }
 
                         let info = payload["info"] as? [String: Any]
-                        let modelFromInfo = info?["model"] as? String
-                            ?? info?["model_name"] as? String
-                            ?? payload["model"] as? String
-                            ?? obj["model"] as? String
-                        let model = currentModel ?? modelFromInfo ?? "gpt-5"
+                        let modelFromInfo = Self.codexModelEvidence(info?["model"] as? String)
+                            ?? Self.codexModelEvidence(info?["model_name"] as? String)
+                            ?? Self.codexModelEvidence(payload["model"] as? String)
+                            ?? Self.codexModelEvidence(obj["model"] as? String)
+                        let model = Self.codexModelEvidence(currentModel)
+                            ?? modelFromInfo
+                            ?? Self.codexUnknownModel
 
                         func toInt(_ v: Any?) -> Int {
                             if let n = v as? NSNumber { return n.intValue }

Tests/CodexBarTests/CostUsageCacheTests.swift

@@ -11,7 +11,7 @@ struct CostUsageCacheTests {
         let claudeURL = CostUsageCacheIO.cacheFileURL(provider: .claude, cacheRoot: root)
         let vertexURL = CostUsageCacheIO.cacheFileURL(provider: .vertexai, cacheRoot: root)
 
-        #expect(codexURL.lastPathComponent == "codex-v8.json")
+        #expect(codexURL.lastPathComponent == "codex-v9.json")
         #expect(claudeURL.lastPathComponent == "claude-v4.json")
         #expect(vertexURL.lastPathComponent == "vertexai-v4.json")
     }

Tests/CodexBarTests/CostUsageScannerBreakdownTests.swift

@@ -1372,6 +1372,122 @@ struct CostUsageScannerBreakdownTests {
         #expect(parsed.days[dayKey]?["gpt-5"] == nil)
     }
 
+    @Test
+    func `codex token count without model remains explicitly unknown`() throws {
+        let env = try CostUsageTestEnvironment()
+        defer { env.cleanup() }
+
+        let day = try env.makeLocalNoon(year: 2026, month: 5, day: 18)
+        let contents = try env.jsonl([
+            self.codexTokenCountWithoutModel(
+                timestamp: env.isoString(for: day),
+                last: (input: 50, cached: 10, output: 5)),
+        ])
+        let fileURL = try env.writeCodexSessionFile(
+            day: day,
+            filename: "token-count-without-model.jsonl",
+            contents: contents)
+
+        let parsed = CostUsageScanner.parseCodexFile(
+            fileURL: fileURL,
+            range: CostUsageScanner.CostUsageDayRange(since: day, until: day))
+        let dayKey = CostUsageScanner.CostUsageDayRange.dayKey(from: day)
+
+        #expect(parsed.days[dayKey]?[CostUsageScanner.codexUnknownModel] == [50, 10, 5])
+        #expect(parsed.days[dayKey]?["gpt-5"] == nil)
+    }
+
+    @Test
+    func `codex turn context remains authoritative over conflicting token model`() throws {
+        let env = try CostUsageTestEnvironment()
+        defer { env.cleanup() }
+
+        let day = try env.makeLocalNoon(year: 2026, month: 5, day: 18)
+        let contents = try env.jsonl([
+            self.codexTurnContext(timestamp: env.isoString(for: day), model: "openai/gpt-5.5"),
+            self.codexTokenCount(
+                timestamp: env.isoString(for: day.addingTimeInterval(1)),
+                model: "openai/gpt-5.6-sol",
+                last: (input: 50, cached: 10, output: 5)),
+        ])
+        let fileURL = try env.writeCodexSessionFile(
+            day: day,
+            filename: "token-count-model-override.jsonl",
+            contents: contents)
+
+        let parsed = CostUsageScanner.parseCodexFile(
+            fileURL: fileURL,
+            range: CostUsageScanner.CostUsageDayRange(since: day, until: day))
+        let dayKey = CostUsageScanner.CostUsageDayRange.dayKey(from: day)
+
+        #expect(parsed.days[dayKey]?["gpt-5.5"] == [50, 10, 5])
+        #expect(parsed.days[dayKey]?["gpt-5.6-sol"] == nil)
+    }
+
+    @Test
+    func `codex blank token count model preserves turn context`() throws {
+        let env = try CostUsageTestEnvironment()
+        defer { env.cleanup() }
+
+        let day = try env.makeLocalNoon(year: 2026, month: 5, day: 18)
+        let contents = try env.jsonl([
+            self.codexTurnContext(timestamp: env.isoString(for: day), model: "openai/gpt-5.5"),
+            self.codexTokenCount(
+                timestamp: env.isoString(for: day.addingTimeInterval(1)),
+                model: "   ",
+                last: (input: 50, cached: 10, output: 5)),
+        ])
+        let fileURL = try env.writeCodexSessionFile(
+            day: day,
+            filename: "blank-token-count-model.jsonl",
+            contents: contents)
+
+        let parsed = CostUsageScanner.parseCodexFile(
+            fileURL: fileURL,
+            range: CostUsageScanner.CostUsageDayRange(since: day, until: day))
+        let dayKey = CostUsageScanner.CostUsageDayRange.dayKey(from: day)
+
+        #expect(parsed.days[dayKey]?["gpt-5.5"] == [50, 10, 5])
+        #expect(parsed.days[dayKey]?[""] == nil)
+    }
+
+    @Test
+    func `codex blank model falls through to model name`() throws {
+        let env = try CostUsageTestEnvironment()
+        defer { env.cleanup() }
+
+        let day = try env.makeLocalNoon(year: 2026, month: 5, day: 18)
+        let event: [String: Any] = [
+            "type": "event_msg",
+            "timestamp": env.isoString(for: day),
+            "payload": [
+                "type": "token_count",
+                "info": [
+                    "model": "",
+                    "model_name": " openai/gpt-5.6-sol ",
+                    "last_token_usage": [
+                        "input_tokens": 50,
+                        "cached_input_tokens": 10,
+                        "output_tokens": 5,
+                    ],
+                ],
+            ],
+        ]
+        let contents = try env.jsonl([event])
+        let fileURL = try env.writeCodexSessionFile(
+            day: day,
+            filename: "blank-model-valid-model-name.jsonl",
+            contents: contents)
+
+        let parsed = CostUsageScanner.parseCodexFile(
+            fileURL: fileURL,
+            range: CostUsageScanner.CostUsageDayRange(since: day, until: day))
+        let dayKey = CostUsageScanner.CostUsageDayRange.dayKey(from: day)
+
+        #expect(parsed.days[dayKey]?["gpt-5.6-sol"] == [50, 10, 5])
+        #expect(parsed.days[dayKey]?[""] == nil)
+    }
+
     @Test
     func `codex daily report writes corrected cache artifact for oversized turn context`() throws {
         let env = try CostUsageTestEnvironment()
@@ -1417,7 +1533,7 @@ struct CostUsageScannerBreakdownTests {
         #expect(first.data[0].totalTokens == 132)
 
         let newCacheURL = CostUsageCacheIO.cacheFileURL(provider: .codex, cacheRoot: env.cacheRoot)
-        #expect(newCacheURL.lastPathComponent == "codex-v8.json")
+        #expect(newCacheURL.lastPathComponent == "codex-v9.json")
         #expect(FileManager.default.fileExists(atPath: newCacheURL.path))
         #expect(FileManager.default.fileExists(atPath: oldCacheURL.path))
 

Tests/CodexBarTests/UsageFormatterTests.swift

@@ -300,6 +300,7 @@ struct UsageFormatterTests {
         #expect(UsageFormatter.modelDisplayName("Claude Opus 4.5 2025 1101") == "Claude Opus 4.5")
         #expect(UsageFormatter.modelDisplayName("claude-sonnet-4-5") == "claude-sonnet-4-5")
         #expect(UsageFormatter.modelDisplayName("gpt-5.3-codex-spark") == "gpt-5.3-codex-spark")
+        #expect(UsageFormatter.modelDisplayName("unknown") == "Unknown model")
     }
 
     @Test