Add opt-in OpenCode local history for the ambient Codex ledger

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Added
 
+- Codex: add an opt-in "Include OpenCode local history (OpenAI)" source that merges machine-local OpenCode usage for `openai`-provider assistant records into the ambient Codex menu/CLI history, with read-only SQLite access, stable-ID deduplication across OpenCode's v1/v2 tables, recorded-cost-as-is semantics, and permanent exclusion from managed accounts, scoped `CODEX_HOME` scans (argument or environment), and the Spend Dashboard (refs #3273). Merged rows carry a visible `(OpenCode local)` model label, source-recorded cost provenance (`sourceRecorded`/`mixed`, never a pure list-price claim), and join the unattributed project bucket in grouped totals while session breakdowns stay native. Database selection mirrors upstream: `OPENCODE_DB` selects exactly one database (`:memory:` reads as no history, never a substitute), otherwise the release database under the XDG data root. Day buckets follow the reporting calendar with a start-of-day lower bound.
 - Providers: add Claude Platform for Console API credit balances, expiring subscription and purchased grants, and optional monthly spend, using its signed-in browser session (#4510). Thanks @mjaverto!
 - About: show bundled open-source acknowledgements and bundle SwiftPM and vendored dependency notices with the app, widget, CLI, and Linux desktop (#4483). Thanks @elijahfriedman!
 

Sources/CodexBar/CostHistoryChartMenuView.swift

@@ -67,6 +67,7 @@ struct CostHistoryChartMenuView: View {
     }
 
     private let provider: UsageProvider
+    private let costProvenance: CostProvenance
     private let daily: [DailyEntry]
     private let totalCostUSD: Double?
     private let currencyCode: String
@@ -96,9 +97,11 @@ struct CostHistoryChartMenuView: View {
         sessions: [CostUsageSessionBreakdown] = [],
         hidePersonalInfo: Bool,
         width: CGFloat,
+        costProvenance: CostProvenance = .listPriceEstimate,
         onMetricChanged: (@MainActor (ChartMetric) -> Void)? = nil)
     {
         self.provider = provider
+        self.costProvenance = costProvenance
         self.daily = daily
         self.totalCostUSD = totalCostUSD
         self.currencyCode = currencyCode
@@ -338,7 +341,7 @@ struct CostHistoryChartMenuView: View {
             if self.totalCostUSD != nil || incompleteCount > 0 {
                 VStack(alignment: .leading, spacing: 2) {
                     Text(String(
-                        format: incompleteCount > 0 ? L("Est. subtotal (%@): %@") : L("Est. total (%@): %@"),
+                        format: self.costTotalLabelKey(incompleteCount: incompleteCount),
                         self.windowLabel,
                         self.totalCostUSD.map(self.costString) ?? "—")
                         + UsageFormatter.incompleteUsageSuffix(incompleteCount))
@@ -348,7 +351,7 @@ struct CostHistoryChartMenuView: View {
                         .truncationMode(.head)
                         .frame(height: Self.detailPrimaryLineHeight, alignment: .leading)
                     if let disclaimer = UsageFormatter.incompleteUsageNote(incompleteCount)
-                        ?? Self.estimateDisclaimer(provider: self.provider)
+                        ?? Self.estimateDisclaimer(provider: self.provider, provenance: self.costProvenance)
                     {
                         Text(disclaimer)
                             .help(disclaimer)
@@ -410,7 +413,22 @@ struct CostHistoryChartMenuView: View {
         }
     }
 
-    static func estimateDisclaimer(provider: UsageProvider) -> String? {
+    // Provider-specific by design: only Codex history can carry source-recorded OpenCode
+    // costs, so only its chart total label and disclaimer follow provenance like the
+    // menu-card hint does.
+    private func costTotalLabelKey(incompleteCount: Int) -> String {
+        guard self.provider == .codex, self.costProvenance == .sourceRecorded else {
+            return incompleteCount > 0 ? "Est. subtotal (%@): %@" : "Est. total (%@): %@"
+        }
+        return incompleteCount > 0 ? "Recorded subtotal (%@): %@" : "Recorded total (%@): %@"
+    }
+
+    static func estimateDisclaimer(provider: UsageProvider, provenance: CostProvenance = .listPriceEstimate) -> String? {
+        if provider == .codex, provenance == .sourceRecorded || provenance == .mixed {
+            return provenance == .mixed
+                ? L("Estimated from token usage plus source-recorded OpenCode cost · not a subscription bill")
+                : L("Source-recorded cost from OpenCode local history · not a subscription bill")
+        }
         guard let hint = ProviderDescriptorRegistry.descriptor(for: provider).tokenCost.chartEstimateDisclaimer else {
             return nil
         }

Sources/CodexBar/InlineUsageDashboardContent.swift

@@ -249,7 +249,7 @@ extension UsageMenuCardView.Model {
             details.append("\(L("Top model")): \(Self.shortModelName(topModel))")
         }
         let tokenCost = ProviderDescriptorRegistry.descriptor(for: input.provider).tokenCost
-        let hintLines = Self.tokenUsageHintLines(provider: input.provider)
+        let hintLines = Self.tokenUsageHintLines(provider: input.provider, provenance: snapshot.costProvenance)
         if tokenCost.hintPlacement == .beforeRequestHistory {
             details.append(contentsOf: hintLines)
         }
@@ -499,7 +499,7 @@ extension UsageMenuCardView.Model {
                 value: L("%@ tokens", snapshot.last30DaysTokens.map(UsageFormatter.tokenCountString) ?? "—"),
                 emphasis: false))
         }
-        var details = Self.tokenUsageHintLines(provider: provider)
+        var details = Self.tokenUsageHintLines(provider: provider, provenance: snapshot.costProvenance)
         if details.isEmpty { details.append(L("Local token history · dollar costs unavailable")) }
         if let coverage = Self.tokenHistoryCoverageHint(snapshot) { details.append(coverage) }
         if comparisonPeriodsEnabled {

Sources/CodexBar/MenuCardView+Costs.swift

@@ -286,7 +286,7 @@ extension UsageMenuCardView.Model {
         let todayIncompleteCount = snapshot.summary(forLastDays: 1, calendar: calendar).incompleteRequestCount
         let err = (error?.isEmpty ?? true) ? nil : error
         let hints = [
-            Self.tokenUsageHint(provider: provider),
+            Self.tokenUsageHint(provider: provider, provenance: snapshot.costProvenance),
             UsageFormatter.incompleteUsageNote(incompleteCount),
             tokensOnly ? Self.tokenHistoryCoverageHint(snapshot) : nil,
         ]
@@ -334,8 +334,11 @@ extension UsageMenuCardView.Model {
             UsageFormatter.tokenCountString(totalTokens)) + suffix
     }
 
-    static func tokenUsageHint(provider: UsageProvider) -> String? {
-        let lines = Self.tokenUsageHintLines(provider: provider)
+    static func tokenUsageHint(
+        provider: UsageProvider,
+        provenance: CostProvenance = .listPriceEstimate) -> String?
+    {
+        let lines = Self.tokenUsageHintLines(provider: provider, provenance: provenance)
         return lines.isEmpty ? nil : lines.joined(separator: "\n")
     }
 
@@ -356,8 +359,18 @@ extension UsageMenuCardView.Model {
             : L("Local token history is unavailable or incomplete.")
     }
 
-    static func tokenUsageHintLines(provider: UsageProvider) -> [String] {
-        ProviderDescriptorRegistry.descriptor(for: provider).tokenCost.menuHintLines.map { hint in
+    static func tokenUsageHintLines(
+        provider: UsageProvider,
+        provenance: CostProvenance = .listPriceEstimate) -> [String]
+    {
+        // Provider-specific by design: only Codex history can mix source-recorded OpenCode
+        // costs into an otherwise list-price estimate, so only that hint follows provenance.
+        if provider == .codex, provenance == .sourceRecorded || provenance == .mixed {
+            return [provenance == .mixed
+                ? L("Estimated from token usage plus source-recorded OpenCode cost · not a subscription bill")
+                : L("Source-recorded cost from OpenCode local history · not a subscription bill")]
+        }
+        return ProviderDescriptorRegistry.descriptor(for: provider).tokenCost.menuHintLines.map { hint in
             switch hint {
             case let .localized(key): L(key)
             case .estimate: UsageFormatter.costEstimateHint(provider: provider)

Sources/CodexBar/PreferencesProviderDetailView.swift

@@ -160,11 +160,14 @@ struct ProviderDetailView<SupplementaryContent: View>: View {
                     Section {
                         ProviderTokenUsageInlineView(provider: self.provider, tokenUsage: tokenUsage)
                     } header: {
-                        Text(L(self.store.settings.codexLocalSessionCostLedgerEnabled ? "This Mac" : "Local usage"))
+                        Text(L(self.store.settings.codexLocalSessionCostLedgerEnabled
+                                || self.store.settings.codexIncludeOpenCodeLocalHistory
+                            ? "This Mac" : "Local usage"))
                     } footer: {
                         SettingsSectionFooter(L(self.store.settings.codexLocalSessionCostLedgerEnabled
-                                ? "Local usage is shared across accounts on this Mac."
-                                : "Local usage comes from the current Codex profile."))
+                                || self.store.settings.codexIncludeOpenCodeLocalHistory
+                            ? "Local usage is shared across accounts on this Mac."
+                            : "Local usage comes from the current Codex profile."))
                     }
                 }
                 if let diagnostic = self.openAIWebDiagnostic {

Sources/CodexBar/PreferencesSpendDashboardPane.swift

@@ -79,6 +79,7 @@ func spendDashboardProvenanceText(_ provenance: CostProvenance) -> String {
     switch provenance {
     case .listPriceEstimate: L("List-price equivalent")
     case .vendorMetered: L("Plan metered")
+    case .sourceRecorded: L("Source recorded")
     case .mixed: L("Metered and list-price")
     case .unknown: L("Spend unavailable")
     }

Sources/CodexBar/Providers/Codex/CodexProviderImplementation.swift

@@ -94,6 +94,23 @@ struct CodexProviderImplementation: ProviderImplementation {
                 onChange: nil,
                 onAppDidBecomeActive: nil,
                 onAppearWhenEnabled: nil),
+            ProviderSettingsToggleDescriptor(
+                id: "codex-opencode-local-history",
+                title: "Include OpenCode local history (OpenAI)",
+                subtitle: [
+                    "Optional, off by default.",
+                    "Merges machine-local OpenCode usage for OpenAI-provider assistant records from ~/.local/share/opencode/opencode.db into this Mac's ambient Codex history.",
+                    "Reads usage metadata only (read-only SQLite: model, tokens, recorded cost); prompts, responses and auth state are never read.",
+                    "OpenCode records $0 cost for subscription usage; recorded dollars are shown as-is and never treated as billing.",
+                    "Rows are attributed to the model only, never to an account, and are excluded from managed accounts, scoped CODEX_HOME scans and the Spend Dashboard.",
+                ].joined(separator: " "),
+                binding: context.binding(\.codexIncludeOpenCodeLocalHistory),
+                statusText: nil,
+                actions: [],
+                isVisible: nil,
+                onChange: nil,
+                onAppDidBecomeActive: nil,
+                onAppearWhenEnabled: nil),
             ProviderSettingsToggleDescriptor(
                 id: "codex-historical-tracking",
                 title: "Historical tracking",

Sources/CodexBar/Providers/Codex/UsageStore+CodexAccountState.swift

@@ -31,7 +31,20 @@ struct CodexAccountScopedRefreshGuard: Equatable {
 @MainActor
 extension UsageStore {
     func accountScopedTokenSnapshot(for provider: UsageProvider) -> CostUsageTokenSnapshot? {
-        guard provider == .codex, !self.settings.codexLocalSessionCostLedgerEnabled else {
+        guard provider == .codex else {
+            return self.tokenSnapshotPublications[provider.instanceID]?.snapshot
+        }
+        if self.settings.codexIncludeOpenCodeLocalHistory {
+            // Ambient history is account-agnostic: an ambient publication stays valid across
+            // account switches (config-revision churn) as long as the ambient scope itself is
+            // still selected — but a pre-toggle scoped publication must not leak account rows
+            // into the machine-local lane, so the scope signature has to match.
+            guard let publication = self.tokenSnapshotPublications[provider.instanceID],
+                  publication.scopeSignature == self.tokenSnapshotScopeSignature(for: provider)
+            else { return nil }
+            return publication.snapshot
+        }
+        guard !self.settings.codexLocalSessionCostLedgerEnabled else {
             return self.tokenSnapshotPublications[provider.instanceID]?.snapshot
         }
         return self.tokenSnapshotForCurrentProviderConfig(for: provider)?.snapshot

Sources/CodexBar/Resources/ar.lproj/Localizable.strings

@@ -1636,6 +1636,8 @@
 "Usage snapshot unavailable" = "ملخص الاستخدام غير متاح";
 "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again." = "تعذر على CodexBar إعداد ملخص استخدام قابل للمشاركة. حدّث الاستخدام والإنفاق ثم حاول مرة أخرى.";
 "Incomplete" = "غير مكتمل";
+"Recorded total (%@): %@" = "إجمالي مسجل (%@): %@";
+"Recorded subtotal (%@): %@" = "إجمالي فرعي مسجل (%@): %@";
 "Est. subtotal (%@): %@" = "الإجمالي الفرعي التقديري (%@): %@";
 "Excluded requests with missing final usage: %d" = "الطلبات المستبعدة لعدم توفر بيانات الاستخدام النهائية: %d";
 

Sources/CodexBar/Resources/ca.lproj/Localizable.strings

@@ -1636,6 +1636,8 @@
 "Usage snapshot unavailable" = "Instantània d'ús no disponible";
 "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again." = "CodexBar no ha pogut preparar una instantània d'ús per compartir. Actualitza Ús i despesa i torna-ho a provar.";
 "Incomplete" = "Incomplet";
+"Recorded total (%@): %@" = "Total registrat (%@): %@";
+"Recorded subtotal (%@): %@" = "Subtotal registrat (%@): %@";
 "Est. subtotal (%@): %@" = "Subtotal estimat (%@): %@";
 "Excluded requests with missing final usage: %d" = "Sol·licituds excloses sense dades d’ús finals: %d";
 

Sources/CodexBar/Resources/de.lproj/Localizable.strings

@@ -1634,6 +1634,8 @@
 "Usage snapshot unavailable" = "Nutzungsübersicht nicht verfügbar";
 "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again." = "CodexBar konnte keine teilbare Nutzungsübersicht erstellen. Aktualisieren Sie „Nutzung & Ausgaben“ und versuchen Sie es erneut.";
 "Incomplete" = "Unvollständig";
+"Recorded total (%@): %@" = "Erfasster Gesamtbetrag (%@): %@";
+"Recorded subtotal (%@): %@" = "Erfasster Teilbetrag (%@): %@";
 "Est. subtotal (%@): %@" = "Geschätzte Zwischensumme (%@): %@";
 "Excluded requests with missing final usage: %d" = "Ausgeschlossene Anfragen ohne abschließende Nutzungsdaten: %d";
 

Sources/CodexBar/Resources/en.lproj/Localizable.strings

@@ -1635,6 +1635,8 @@
 "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again." = "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again.";
 "Incomplete" = "Incomplete";
 
+"Recorded total (%@): %@" = "Recorded total (%@): %@";
+"Recorded subtotal (%@): %@" = "Recorded subtotal (%@): %@";
 "Est. subtotal (%@): %@" = "Est. subtotal (%@): %@";
 
 "Excluded requests with missing final usage: %d" = "Excluded requests with missing final usage: %d";

Sources/CodexBar/Resources/es.lproj/Localizable.strings

@@ -1630,6 +1630,8 @@
 "Usage snapshot unavailable" = "Instantánea de uso no disponible";
 "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again." = "CodexBar no pudo preparar una instantánea de uso para compartir. Actualiza Uso y gasto y vuelve a intentarlo.";
 "Incomplete" = "Incompleto";
+"Recorded total (%@): %@" = "Total registrado (%@): %@";
+"Recorded subtotal (%@): %@" = "Subtotal registrado (%@): %@";
 "Est. subtotal (%@): %@" = "Subtotal estimado (%@): %@";
 "Excluded requests with missing final usage: %d" = "Solicitudes excluidas sin datos de uso finales: %d";
 

Sources/CodexBar/Resources/fa.lproj/Localizable.strings

@@ -1636,6 +1636,8 @@
 "Usage snapshot unavailable" = "نمای کلی استفاده در دسترس نیست";
 "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again." = "CodexBar نتوانست نمای کلی استفاده قابل اشتراک‌گذاری را آماده کند. استفاده و هزینه را تازه‌سازی کنید و دوباره امتحان کنید.";
 "Incomplete" = "ناقص";
+"Recorded total (%@): %@" = "مجموع ثبت‌شده (%@): %@";
+"Recorded subtotal (%@): %@" = "جمع جزئی ثبت‌شده (%@): %@";
 "Est. subtotal (%@): %@" = "جمع جزئی تخمینی (%@): %@";
 "Excluded requests with missing final usage: %d" = "درخواست‌های حذف‌شده به دلیل نبود داده‌های مصرف نهایی: %d";
 

Sources/CodexBar/Resources/fr.lproj/Localizable.strings

@@ -1631,6 +1631,8 @@
 "Usage snapshot unavailable" = "Aperçu de l’utilisation indisponible";
 "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again." = "CodexBar n’a pas pu préparer un aperçu de l’utilisation à partager. Actualisez Utilisation et dépenses, puis réessayez.";
 "Incomplete" = "Incomplet";
+"Recorded total (%@): %@" = "Total enregistré (%@) : %@";
+"Recorded subtotal (%@): %@" = "Sous-total enregistré (%@) : %@";
 "Est. subtotal (%@): %@" = "Sous-total estimé (%@) : %@";
 "Excluded requests with missing final usage: %d" = "Requêtes exclues sans données d’utilisation finales : %d";
 

Sources/CodexBar/Resources/gl.lproj/Localizable.strings

@@ -1631,6 +1631,8 @@
 "Usage snapshot unavailable" = "Resumo do uso non dispoñible";
 "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again." = "CodexBar non puido preparar un resumo do uso para compartir. Actualiza Uso e gasto e téntao de novo.";
 "Incomplete" = "Incompleto";
+"Recorded total (%@): %@" = "Total rexistrado (%@): %@";
+"Recorded subtotal (%@): %@" = "Subtotal rexistrado (%@): %@";
 "Est. subtotal (%@): %@" = "Subtotal estimado (%@): %@";
 "Excluded requests with missing final usage: %d" = "Solicitudes excluídas sen datos de uso finais: %d";
 

Sources/CodexBar/Resources/id.lproj/Localizable.strings

@@ -1635,6 +1635,8 @@
 "Usage snapshot unavailable" = "Ringkasan penggunaan tidak tersedia";
 "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again." = "CodexBar tidak dapat menyiapkan ringkasan penggunaan untuk dibagikan. Segarkan Penggunaan & pengeluaran, lalu coba lagi.";
 "Incomplete" = "Tidak lengkap";
+"Recorded total (%@): %@" = "Total tercatat (%@): %@";
+"Recorded subtotal (%@): %@" = "Subtotal tercatat (%@): %@";
 "Est. subtotal (%@): %@" = "Subtotal perkiraan (%@): %@";
 "Excluded requests with missing final usage: %d" = "Permintaan yang dikecualikan karena data penggunaan akhir tidak tersedia: %d";
 

Sources/CodexBar/Resources/it.lproj/Localizable.strings

@@ -1636,6 +1636,8 @@
 "Usage snapshot unavailable" = "Riepilogo utilizzo non disponibile";
 "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again." = "CodexBar non ha potuto preparare un riepilogo dell’utilizzo da condividere. Aggiorna Utilizzo e spesa e riprova.";
 "Incomplete" = "Incompleto";
+"Recorded total (%@): %@" = "Totale registrato (%@): %@";
+"Recorded subtotal (%@): %@" = "Subtotale registrato (%@): %@";
 "Est. subtotal (%@): %@" = "Subtotale stimato (%@): %@";
 "Excluded requests with missing final usage: %d" = "Richieste escluse senza dati di utilizzo finali: %d";
 

Sources/CodexBar/Resources/ja.lproj/Localizable.strings

@@ -1632,6 +1632,8 @@
 "Usage snapshot unavailable" = "使用状況の概要を利用できません";
 "CodexBar couldn't prepare a shareable usage snapshot. Refresh Usage & Spend and try again." = "CodexBar で共有用の使用状況の概要を準備できませんでした。「使用状況と支出」を更新して、もう一度お試しください。";
 "Incomplete" = "不完全";
+"Recorded total (%@): %@" = "記録された合計 (%@): %@";
+"Recorded subtotal (%@): %@" = "記録された小計 (%@): %@";
 "Est. subtotal (%@): %@" = "推定小計 (%@): %@";
 "Excluded requests with missing final usage: %d" = "最終的な使用量が未記録のため除外されたリクエスト: %d";