Fix GPT-5.6 catalog pricing cache invalidation

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 = "7985c9336eb88ef7"
+    static let value = "ed9cd73bd15c2398"
 }

Sources/CodexBarCore/PiSessionCostScanner.swift

@@ -211,7 +211,8 @@ enum PiSessionCostScanner {
             pricingKey: CostUsagePricingKey.codex(
                 modelsDevArtifact: modelsDevArtifact,
                 formulaVersion: Self.costFormulaVersion,
-                parserHash: CodexParserHash.value))
+                parserHash: CodexParserHash.value,
+                modelsDevProviderIDs: ["anthropic", "openai"]))
     }
 
     private static func requestedWindowExpandsCache(

Sources/CodexBarCore/Vendored/CostUsage/CostUsagePricing.swift

@@ -523,12 +523,17 @@ enum CostUsagePricing {
         modelsDevCacheRoot: URL? = nil) -> Double?
     {
         let key = self.normalizeCodexModel(model)
-        if let lookup = self.modelsDevLookup(
+        let modelsDevLookup = self.modelsDevLookup(
             providerID: self.codexModelsDevProviderID,
             model: model,
             catalog: modelsDevCatalog,
             cacheRoot: modelsDevCacheRoot)
-        {
+            ?? (model == key ? nil : self.modelsDevLookup(
+                providerID: self.codexModelsDevProviderID,
+                model: key,
+                catalog: modelsDevCatalog,
+                cacheRoot: modelsDevCacheRoot))
+        if let lookup = modelsDevLookup {
             let bundled = self.codex[key]
             // A missing catalog context block means models.dev has no long-context opinion, so use
             // the bundled tuple. Once the block exists, preserve its omissions and normal fallback

Sources/CodexBarCore/Vendored/CostUsage/CostUsagePricingKey.swift

@@ -9,7 +9,8 @@ enum CostUsagePricingKey {
     static func codex(
         modelsDevArtifact: ModelsDevCacheArtifact?,
         formulaVersion: Int,
-        parserHash: String? = nil) -> String
+        parserHash: String? = nil,
+        modelsDevProviderIDs: Set<String> = ["openai"]) -> String
     {
         var parts = [
             "costFormulaVersion=\(formulaVersion)",
@@ -22,35 +23,42 @@ enum CostUsagePricingKey {
         let prefix: String
         if let modelsDevArtifact {
             prefix = "models-dev-v\(modelsDevArtifact.version)"
-            parts.append("modelsDevPricing:\n\(self.modelsDevPricingFingerprint(modelsDevArtifact.catalog))")
+            let modelsDevPricing = self.modelsDevPricingFingerprint(
+                modelsDevArtifact.catalog,
+                providerIDs: modelsDevProviderIDs)
+            parts.append("modelsDevPricing:\n\(modelsDevPricing)")
         } else {
             prefix = "builtin"
             parts.append("modelsDevPricing:none")
         }
         return "\(prefix)-\(self.sha256Hex(Data(parts.joined(separator: "\n").utf8)))"
     }
 
-    private static func modelsDevPricingFingerprint(_ catalog: ModelsDevCatalog) -> String {
+    private static func modelsDevPricingFingerprint(
+        _ catalog: ModelsDevCatalog,
+        providerIDs: Set<String>) -> String
+    {
         var parts: [String] = []
-        for providerID in catalog.providers.keys.sorted() {
+        let normalizedProviderIDs = Set(providerIDs.map(ModelsDevProvider.normalizeProviderID))
+        for providerID in normalizedProviderIDs.sorted() {
             guard let provider = catalog.providers[providerID] else { continue }
-            parts.append("provider=\(providerID)|\(provider.id ?? "")")
             for modelKey in provider.models.keys.sorted() {
-                guard let model = provider.models[modelKey] else { continue }
+                guard let model = provider.models[modelKey], model.isPriceable else { continue }
                 let cost = model.cost
                 let contextOver200K = cost?.contextOver200K
                 parts.append([
+                    "provider=\(providerID)",
                     "model=\(modelKey)",
                     model.id,
                     self.optionalDoubleFingerprint(cost?.input),
                     self.optionalDoubleFingerprint(cost?.output),
                     self.optionalDoubleFingerprint(cost?.cacheRead),
                     self.optionalDoubleFingerprint(cost?.cacheWrite),
+                    contextOver200K == nil ? "contextOver200K=absent" : "contextOver200K=present",
                     self.optionalDoubleFingerprint(contextOver200K?.input),
                     self.optionalDoubleFingerprint(contextOver200K?.output),
                     self.optionalDoubleFingerprint(contextOver200K?.cacheRead),
                     self.optionalDoubleFingerprint(contextOver200K?.cacheWrite),
-                    model.limit?.context.map(String.init) ?? "nil",
                 ].joined(separator: "|"))
             }
         }

Tests/CodexBarTests/CostUsagePricingTests.swift

@@ -116,6 +116,99 @@ struct CostUsagePricingTests {
         #expect(alias == sol)
     }
 
+    @Test
+    func `codex models dev falls back from gpt56 alias to canonical sol pricing`() throws {
+        let canonicalOnlyRoot = try Self.seedModelsDevCache("""
+        {
+          "openai": {
+            "id": "openai",
+            "models": {
+              "gpt-5.6-sol": {
+                "id": "gpt-5.6-sol",
+                "cost": { "input": 7, "output": 31 }
+              }
+            }
+          }
+        }
+        """)
+        let aliasAndCanonicalRoot = try Self.seedModelsDevCache("""
+        {
+          "openai": {
+            "id": "openai",
+            "models": {
+              "gpt-5.6": {
+                "id": "gpt-5.6",
+                "cost": { "input": 3, "output": 13 }
+              },
+              "gpt-5.6-sol": {
+                "id": "gpt-5.6-sol",
+                "cost": { "input": 7, "output": 31 }
+              }
+            }
+          }
+        }
+        """)
+
+        let canonicalFallback = CostUsagePricing.codexCostUSD(
+            model: "gpt-5.6",
+            inputTokens: 100,
+            cachedInputTokens: 0,
+            outputTokens: 0,
+            modelsDevCacheRoot: canonicalOnlyRoot)
+        let exactAlias = CostUsagePricing.codexCostUSD(
+            model: "gpt-5.6",
+            inputTokens: 100,
+            cachedInputTokens: 0,
+            outputTokens: 0,
+            modelsDevCacheRoot: aliasAndCanonicalRoot)
+
+        #expect(canonicalFallback == 100.0 * 7e-6)
+        #expect(exactAlias == 100.0 * 3e-6)
+    }
+
+    @Test
+    func `codex pricing key distinguishes an empty long context block from no block`() throws {
+        let withoutLongContext = try Self.modelsDevArtifact("""
+        {
+          "openai": {
+            "id": "openai",
+            "models": {
+              "gpt-5.6-sol": {
+                "id": "gpt-5.6-sol",
+                "cost": { "input": 5, "output": 30 }
+              }
+            }
+          }
+        }
+        """)
+        let withEmptyLongContext = try Self.modelsDevArtifact("""
+        {
+          "openai": {
+            "id": "openai",
+            "models": {
+              "gpt-5.6-sol": {
+                "id": "gpt-5.6-sol",
+                "cost": {
+                  "input": 5,
+                  "output": 30,
+                  "context_over_200k": {}
+                }
+              }
+            }
+          }
+        }
+        """)
+
+        let withoutKey = CostUsagePricingKey.codex(
+            modelsDevArtifact: withoutLongContext,
+            formulaVersion: 1)
+        let withEmptyKey = CostUsagePricingKey.codex(
+            modelsDevArtifact: withEmptyLongContext,
+            formulaVersion: 1)
+
+        #expect(withoutKey != withEmptyKey)
+    }
+
     @Test
     func `codex cost applies gpt56 long context rates`() throws {
         let root = try Self.cacheRoot()
@@ -979,6 +1072,14 @@ extension CostUsagePricingTests {
         return root
     }
 
+    private static func modelsDevArtifact(_ json: String) throws -> ModelsDevCacheArtifact {
+        let catalog = try JSONDecoder().decode(ModelsDevCatalog.self, from: Data(json.utf8))
+        return ModelsDevCacheArtifact(
+            version: ModelsDevCache.artifactVersion,
+            fetchedAt: Date(timeIntervalSince1970: 0),
+            catalog: catalog)
+    }
+
     private static func cacheRoot() throws -> URL {
         let root = FileManager.default.temporaryDirectory
             .appendingPathComponent("codexbar-pricing-tests-\(UUID().uuidString)", isDirectory: true)