Skip to content

fix: show external Codex usage without inflating OpenCode Zen #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Daltonganger wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix: show external Codex usage without inflating OpenCode Zen #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65cf487
fix: show external Codex usage without inflating OpenCode Zen
Daltonganger Apr 2, 2026
2e213e1
fix: harden SelfServiceUsageResponse.limits decoding and prevent doub…
Copilot Apr 2, 2026
45c0ee5
fix: address Codex review follow-ups
Daltonganger Apr 2, 2026
90fb9e5
fix: prefer opencode.jsonc when loading OpenCode config (#118)
Daltonganger Apr 3, 2026
b00a8b9
merge: resolve main conflicts for Codex auth handling
Daltonganger Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions CopilotMonitor/CopilotMonitor/Models/ProviderResult.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,19 @@ struct DetailedUsage {
let secondaryUsage: Double?
let secondaryReset: Date?
let primaryReset: Date?
let codexPrimaryWindowLabel: String?
let codexPrimaryWindowHours: Int?
let codexSecondaryWindowLabel: String?
let codexSecondaryWindowHours: Int?
let sparkUsage: Double?
let sparkReset: Date?
let sparkSecondaryUsage: Double?
let sparkSecondaryReset: Date?
let sparkWindowLabel: String?
let sparkPrimaryWindowLabel: String?
let sparkPrimaryWindowHours: Int?
let sparkSecondaryWindowLabel: String?
let sparkSecondaryWindowHours: Int?

// Codex/Antigravity plan info
let creditsBalance: Double?
Expand Down Expand Up @@ -212,11 +220,19 @@ struct DetailedUsage {
secondaryUsage: Double? = nil,
secondaryReset: Date? = nil,
primaryReset: Date? = nil,
codexPrimaryWindowLabel: String? = nil,
codexPrimaryWindowHours: Int? = nil,
codexSecondaryWindowLabel: String? = nil,
codexSecondaryWindowHours: Int? = nil,
sparkUsage: Double? = nil,
sparkReset: Date? = nil,
sparkSecondaryUsage: Double? = nil,
sparkSecondaryReset: Date? = nil,
sparkWindowLabel: String? = nil,
sparkPrimaryWindowLabel: String? = nil,
sparkPrimaryWindowHours: Int? = nil,
sparkSecondaryWindowLabel: String? = nil,
sparkSecondaryWindowHours: Int? = nil,
creditsBalance: Double? = nil,
planType: String? = nil,
chutesMonthlyValueCapUSD: Double? = nil,
Expand Down Expand Up @@ -278,11 +294,19 @@ struct DetailedUsage {
self.secondaryUsage = secondaryUsage
self.secondaryReset = secondaryReset
self.primaryReset = primaryReset
self.codexPrimaryWindowLabel = codexPrimaryWindowLabel
self.codexPrimaryWindowHours = codexPrimaryWindowHours
self.codexSecondaryWindowLabel = codexSecondaryWindowLabel
self.codexSecondaryWindowHours = codexSecondaryWindowHours
self.sparkUsage = sparkUsage
self.sparkReset = sparkReset
self.sparkSecondaryUsage = sparkSecondaryUsage
self.sparkSecondaryReset = sparkSecondaryReset
self.sparkWindowLabel = sparkWindowLabel
self.sparkPrimaryWindowLabel = sparkPrimaryWindowLabel
self.sparkPrimaryWindowHours = sparkPrimaryWindowHours
self.sparkSecondaryWindowLabel = sparkSecondaryWindowLabel
self.sparkSecondaryWindowHours = sparkSecondaryWindowHours
self.creditsBalance = creditsBalance
self.planType = planType
self.chutesMonthlyValueCapUSD = chutesMonthlyValueCapUSD
Expand Down Expand Up @@ -332,7 +356,9 @@ extension DetailedUsage: Codable {
case fiveHourUsage, fiveHourReset, sevenDayUsage, sevenDayReset
case sonnetUsage, sonnetReset, opusUsage, opusReset, modelBreakdown, modelResetTimes
case secondaryUsage, secondaryReset, primaryReset
case codexPrimaryWindowLabel, codexPrimaryWindowHours, codexSecondaryWindowLabel, codexSecondaryWindowHours
case sparkUsage, sparkReset, sparkSecondaryUsage, sparkSecondaryReset, sparkWindowLabel
case sparkPrimaryWindowLabel, sparkPrimaryWindowHours, sparkSecondaryWindowLabel, sparkSecondaryWindowHours
case creditsBalance, planType
case chutesMonthlyValueCapUSD, chutesMonthlyValueUsedUSD, chutesMonthlyValueUsedPercent
case extraUsageEnabled
Expand Down Expand Up @@ -370,11 +396,19 @@ extension DetailedUsage: Codable {
secondaryUsage = try container.decodeIfPresent(Double.self, forKey: .secondaryUsage)
secondaryReset = try container.decodeIfPresent(Date.self, forKey: .secondaryReset)
primaryReset = try container.decodeIfPresent(Date.self, forKey: .primaryReset)
codexPrimaryWindowLabel = try container.decodeIfPresent(String.self, forKey: .codexPrimaryWindowLabel)
codexPrimaryWindowHours = try container.decodeIfPresent(Int.self, forKey: .codexPrimaryWindowHours)
codexSecondaryWindowLabel = try container.decodeIfPresent(String.self, forKey: .codexSecondaryWindowLabel)
codexSecondaryWindowHours = try container.decodeIfPresent(Int.self, forKey: .codexSecondaryWindowHours)
sparkUsage = try container.decodeIfPresent(Double.self, forKey: .sparkUsage)
sparkReset = try container.decodeIfPresent(Date.self, forKey: .sparkReset)
sparkSecondaryUsage = try container.decodeIfPresent(Double.self, forKey: .sparkSecondaryUsage)
sparkSecondaryReset = try container.decodeIfPresent(Date.self, forKey: .sparkSecondaryReset)
sparkWindowLabel = try container.decodeIfPresent(String.self, forKey: .sparkWindowLabel)
sparkPrimaryWindowLabel = try container.decodeIfPresent(String.self, forKey: .sparkPrimaryWindowLabel)
sparkPrimaryWindowHours = try container.decodeIfPresent(Int.self, forKey: .sparkPrimaryWindowHours)
sparkSecondaryWindowLabel = try container.decodeIfPresent(String.self, forKey: .sparkSecondaryWindowLabel)
sparkSecondaryWindowHours = try container.decodeIfPresent(Int.self, forKey: .sparkSecondaryWindowHours)
creditsBalance = try container.decodeIfPresent(Double.self, forKey: .creditsBalance)
planType = try container.decodeIfPresent(String.self, forKey: .planType)
chutesMonthlyValueCapUSD = try container.decodeIfPresent(Double.self, forKey: .chutesMonthlyValueCapUSD)
Expand Down Expand Up @@ -439,11 +473,19 @@ extension DetailedUsage: Codable {
try container.encodeIfPresent(secondaryUsage, forKey: .secondaryUsage)
try container.encodeIfPresent(secondaryReset, forKey: .secondaryReset)
try container.encodeIfPresent(primaryReset, forKey: .primaryReset)
try container.encodeIfPresent(codexPrimaryWindowLabel, forKey: .codexPrimaryWindowLabel)
try container.encodeIfPresent(codexPrimaryWindowHours, forKey: .codexPrimaryWindowHours)
try container.encodeIfPresent(codexSecondaryWindowLabel, forKey: .codexSecondaryWindowLabel)
try container.encodeIfPresent(codexSecondaryWindowHours, forKey: .codexSecondaryWindowHours)
try container.encodeIfPresent(sparkUsage, forKey: .sparkUsage)
try container.encodeIfPresent(sparkReset, forKey: .sparkReset)
try container.encodeIfPresent(sparkSecondaryUsage, forKey: .sparkSecondaryUsage)
try container.encodeIfPresent(sparkSecondaryReset, forKey: .sparkSecondaryReset)
try container.encodeIfPresent(sparkWindowLabel, forKey: .sparkWindowLabel)
try container.encodeIfPresent(sparkPrimaryWindowLabel, forKey: .sparkPrimaryWindowLabel)
try container.encodeIfPresent(sparkPrimaryWindowHours, forKey: .sparkPrimaryWindowHours)
try container.encodeIfPresent(sparkSecondaryWindowLabel, forKey: .sparkSecondaryWindowLabel)
try container.encodeIfPresent(sparkSecondaryWindowHours, forKey: .sparkSecondaryWindowHours)
try container.encodeIfPresent(creditsBalance, forKey: .creditsBalance)
try container.encodeIfPresent(planType, forKey: .planType)
try container.encodeIfPresent(chutesMonthlyValueCapUSD, forKey: .chutesMonthlyValueCapUSD)
Expand Down
Loading