Fix token cost estimation for non-Anthropic models in Claude logs (#2393)

.github/workflows/ci.yml

@@ -291,7 +291,14 @@ jobs:
           echo "SWIFTLY_HOME_DIR=$SWIFTLY_HOME_DIR" >> "$GITHUB_ENV"
           echo "SWIFTLY_BIN_DIR=$SWIFTLY_BIN_DIR" >> "$GITHUB_ENV"
 
-          swiftly install "$SWIFT_VERSION" --use --assume-yes --verify --post-install-file "$POST_INSTALL_SCRIPT"
+          for i in 1 2 3 4 5; do
+            if swiftly install "$SWIFT_VERSION" --use --assume-yes --verify --post-install-file "$POST_INSTALL_SCRIPT"; then
+              break
+            fi
+            if [ "$i" -eq 5 ]; then exit 1; fi
+            echo "swiftly install failed, retrying in 5s (attempt $i/5)..."
+            sleep 5
+          done
           if [[ -s "$POST_INSTALL_SCRIPT" ]]; then
             sudo apt-get update
             sudo bash "$POST_INSTALL_SCRIPT"
@@ -475,7 +482,14 @@ jobs:
           echo "SWIFTLY_HOME_DIR=$SWIFTLY_HOME_DIR" >> "$GITHUB_ENV"
           echo "SWIFTLY_BIN_DIR=$SWIFTLY_BIN_DIR" >> "$GITHUB_ENV"
 
-          swiftly install "$SWIFT_VERSION" --use --assume-yes --verify --post-install-file "$POST_INSTALL_SCRIPT"
+          for i in 1 2 3 4 5; do
+            if swiftly install "$SWIFT_VERSION" --use --assume-yes --verify --post-install-file "$POST_INSTALL_SCRIPT"; then
+              break
+            fi
+            if [ "$i" -eq 5 ]; then exit 1; fi
+            echo "swiftly install failed, retrying in 5s (attempt $i/5)..."
+            sleep 5
+          done
           if [[ -s "$POST_INSTALL_SCRIPT" ]]; then
             sudo apt-get update
             sudo bash "$POST_INSTALL_SCRIPT"

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 = "3aa49b47f4b78e13"
+    static let value = "97bacfaad6061bef"
 }

Sources/CodexBarCore/Host/Process/SubprocessRunner.swift

@@ -221,13 +221,16 @@ public enum SubprocessRunner {
         }
 
         do {
-            try process.run()
+            try await Self.launchProcessWithRetry(process)
         } catch {
             process.terminationHandler = nil
             stdoutCapture.stop()
             stdoutPipe.fileHandleForWriting.closeFile()
             stderrCapture.stop()
             stderrPipe.fileHandleForWriting.closeFile()
+            if error is CancellationError {
+                throw error
+            }
             throw SubprocessRunnerError.launchFailed(error.localizedDescription)
         }
         stdoutCapture.start()
@@ -338,4 +341,43 @@ public enum SubprocessRunner {
             throw error
         }
     }
+
+    private static func launchProcessWithRetry(_ process: Process) async throws {
+        var launchError: Error?
+        for attempt in 0..<5 {
+            do {
+                try process.run()
+                return
+            } catch {
+                launchError = error
+                if self.isTextFileBusyError(error), attempt < 4 {
+                    try await Task.sleep(nanoseconds: 20_000_000)
+                    continue
+                }
+                break
+            }
+        }
+        if let launchError {
+            throw launchError
+        }
+    }
+
+    /// Detects `ETXTBSY` launch failures, including Foundation's wrapped
+    /// `NSCocoaErrorDomain` representation whose POSIX details live in `NSUnderlyingErrorKey`.
+    package static func isTextFileBusyError(_ initialError: Error) -> Bool {
+        var currentError: Error? = initialError
+        while let err = currentError {
+            let nsErr = err as NSError
+            if nsErr.domain == NSPOSIXErrorDomain, nsErr.code == Int(ETXTBSY) {
+                return true
+            }
+            if let underlying = nsErr.userInfo[NSUnderlyingErrorKey] as? Error {
+                currentError = underlying
+            } else {
+                break
+            }
+        }
+        let desc = initialError.localizedDescription
+        return desc.contains("Text file busy") || desc.contains("ETXTBSY")
+    }
 }

Sources/CodexBarCore/Vendored/CostUsage/CostUsageCache.swift

@@ -13,7 +13,9 @@ enum CostUsageCacheIO {
         case .codex:
             11
         case .claude, .vertexai:
-            6
+            // v7: row identity now falls back to a lone nonempty message/request ID, so cached
+            // Claude/Vertex rows must be rebuilt under the shared in-file + incremental rule.
+            7
         default:
             1
         }