Fix CrossModel menu metrics and diagnostics

Author: hujuncheng

Sources/CodexBar/SettingsStore+MenuPreferences.swift

@@ -143,7 +143,7 @@ extension SettingsStore {
 
     static func isBalanceOnlyProvider(_ provider: UsageProvider) -> Bool {
         switch provider {
-        case .deepseek, .mistral, .kimik2, .moonshot, .poe:
+        case .deepseek, .mistral, .kimik2, .moonshot, .poe, .crossmodel:
             true
         default:
             false

Sources/CodexBar/UsageStore.swift

@@ -969,6 +969,7 @@ extension UsageStore {
         let openAIDebugContext = self.openAIAPIKeyDebugContext(processEnvironment: processEnvironment)
         let azureOpenAIDebugContext = self.azureOpenAIAPIKeyDebugContext(processEnvironment: processEnvironment)
         let openRouterDebugContext = self.openRouterAPIKeyDebugContext(processEnvironment: processEnvironment)
+        let crossModelDebugContext = self.crossModelAPIKeyDebugContext(processEnvironment: processEnvironment)
         let elevenLabsDebugContext = self.elevenLabsAPIKeyDebugContext(processEnvironment: processEnvironment)
         let deepSeekHasEnvToken = DeepSeekSettingsReader.apiKey(environment: processEnvironment) != nil
         let deepSeekHasTokenAccount = self.settings.selectedTokenAccount(for: .deepseek) != nil
@@ -1070,10 +1071,7 @@ extension UsageStore {
                 case .openrouter:
                     return Self.apiKeyDebugLine(openRouterDebugContext)
                 case .crossmodel:
-                    let resolution = ProviderTokenResolver.crossModelResolution()
-                    let hasAny = resolution != nil
-                    let source = resolution?.source.rawValue ?? "none"
-                    return "CROSSMODEL_API_KEY=\(hasAny ? "present" : "missing") source=\(source)"
+                    return Self.apiKeyDebugLine(crossModelDebugContext)
                 case .elevenlabs:
                     return Self.apiKeyDebugLine(elevenLabsDebugContext)
                 case .warp:
@@ -1262,6 +1260,20 @@ extension UsageStore {
             hasTokenAccount: false)
     }
 
+    private func crossModelAPIKeyDebugContext(processEnvironment: [String: String]) -> APIKeyDebugContext {
+        let config = self.settings.providerConfig(for: .crossmodel)
+        let environment = ProviderConfigEnvironment.applyAPIKeyOverride(
+            base: processEnvironment,
+            provider: .crossmodel,
+            config: config)
+        return APIKeyDebugContext(
+            label: "CROSSMODEL_API_KEY",
+            resolution: ProviderTokenResolver.crossModelResolution(environment: environment),
+            configToken: config?.sanitizedAPIKey,
+            hasEnvToken: CrossModelSettingsReader.apiToken(environment: processEnvironment) != nil,
+            hasTokenAccount: false)
+    }
+
     private func elevenLabsAPIKeyDebugContext(processEnvironment: [String: String]) -> APIKeyDebugContext {
         let config = self.settings.providerConfig(for: .elevenlabs)
         let environment = ProviderConfigEnvironment.applyAPIKeyOverride(

Tests/CodexBarTests/SettingsStoreAdditionalTests.swift

@@ -154,7 +154,7 @@ struct SettingsStoreAdditionalTests {
     func `menu bar metric preference restricts text only balance providers to automatic`() {
         let settings = Self.makeSettingsStore(suite: "SettingsStoreAdditionalTests-text-only-metric")
 
-        for provider in [UsageProvider.deepseek, .kimik2, .poe] {
+        for provider in [UsageProvider.deepseek, .kimik2, .poe, .crossmodel] {
             settings.setMenuBarMetricPreference(.primary, for: provider)
             #expect(settings.menuBarMetricPreference(for: provider) == .automatic)
 

Tests/CodexBarTests/UsageStorePathDebugTests.swift

@@ -52,4 +52,27 @@ struct UsageStorePathDebugTests {
 
         #expect(debugLog == "DEEPSEEK_API_KEY=present source=settings-token-account")
     }
+
+    @Test
+    func `crossmodel debug log includes config backed api key`() async throws {
+        let suite = "UsageStorePathDebugTests-crossmodel-debug-config-key"
+        let defaults = try #require(UserDefaults(suiteName: suite))
+        defaults.removePersistentDomain(forName: suite)
+        let configStore = testConfigStore(suiteName: suite)
+        let settings = SettingsStore(
+            userDefaults: defaults,
+            configStore: configStore,
+            zaiTokenStore: NoopZaiTokenStore())
+        settings.crossModelAPIToken = "cm-config-test"
+        let store = UsageStore(
+            fetcher: UsageFetcher(),
+            browserDetection: BrowserDetection(cacheTTL: 0),
+            settings: settings,
+            startupBehavior: .testing,
+            environmentBase: [:])
+
+        let debugLog = await store.debugLog(for: UsageProvider.crossmodel)
+
+        #expect(debugLog == "CROSSMODEL_API_KEY=present source=settings-config")
+    }
 }