Skip to content

Show DeepSeek Platform usage with cost summary #2270

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

Merged
steipete merged 3 commits into from
Jul 18, 2026
Merged

Show DeepSeek Platform usage with cost summary #2270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f307892
Show DeepSeek usage with cost summary
Zihao-Qi Jul 17, 2026
9b3ebfd
Remove feature changelog entry
Zihao-Qi Jul 17, 2026
482bc03
fix: preserve DeepSeek session opt-in
steipete Jul 18, 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
5 changes: 4 additions & 1 deletion Sources/CodexBar/InlineUsageDashboardContent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ extension UsageMenuCardView.Model {
return [L("Select a DeepSeek Chrome profile in Settings.")]
}
}
guard input.showOptionalCreditsAndExtraUsage else { return nil }
guard input.tokenCostInlineDashboardEnabled,
input.showOptionalCreditsAndExtraUsage
else { return nil }
guard let usage = input.snapshot?.deepseekUsage else {
if input.snapshot?.deepseekDetailedUsageState == .webSessionRequired {
return [L("Sign in to DeepSeek Platform in Chrome for detailed usage.")]
Expand Down Expand Up @@ -240,6 +242,7 @@ extension UsageMenuCardView.Model {
}
if input.provider == .deepseek,
!input.isRefreshing,
input.tokenCostInlineDashboardEnabled,
input.showOptionalCreditsAndExtraUsage,
let usage = input.snapshot?.deepseekUsage,
!usage.daily.isEmpty
Expand Down
12 changes: 6 additions & 6 deletions Sources/CodexBar/Providers/Shared/ProviderTokenAccountSelection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ enum ProviderTokenAccountSelection {
settings: SettingsStore,
override: TokenAccountOverride?) -> ProviderTokenAccount?
{
if let override, override.provider == provider { return override.account }
if let override, override.provider == provider {
return override.account
}
return settings.effectiveSelectedTokenAccount(for: provider)
}

Expand All @@ -23,11 +25,9 @@ enum ProviderTokenAccountSelection {
settings: SettingsStore,
override: TokenAccountOverride?) -> Bool
{
guard settings.showOptionalCreditsAndExtraUsage else { return false }
guard provider == .deepseek,
let override,
override.provider == provider
else { return true }
guard provider == .deepseek else { return settings.showOptionalCreditsAndExtraUsage }
guard settings.costUsageEnabled, settings.showOptionalCreditsAndExtraUsage else { return false }

@chatgpt-codex-connector chatgpt-codex-connector Bot Jul 18, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Stop gating DeepSeek cost usage on extras

When DeepSeek's Cost summary is set to Inline/Submenu/Both but "Show credits & extra usage" is off, this guard still returns false, so ProviderFetchContext.includeOptionalUsage is false and DeepSeekProviderDescriptor.loadUsage skips importing/fetching the Platform usage summary. That leaves the new cost-summary chart and notes unavailable even though Cost summary is enabled, which preserves the user-facing failure this change is meant to move away from; the DeepSeek branch should key off the Cost summary setting and active-account check, not the extras toggle.

Useful? React with 👍 / 👎.

guard let override, override.provider == provider else { return true }
return settings.selectedTokenAccount(for: provider)?.id == override.account.id
}
}
14 changes: 11 additions & 3 deletions Sources/CodexBar/SettingsStore+TokenCost.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ import Foundation

extension SettingsStore {
func costSummaryShowsInlineDashboard(for provider: UsageProvider) -> Bool {
self.isCostUsageEffectivelyEnabled(for: provider) &&
// DeepSeek has no cost submenu, so any enabled cost-summary style falls back to inline.
if provider == .deepseek {
return self.costUsageEnabled
}
return self.isCostUsageEffectivelyEnabled(for: provider) &&
self.costSummaryDisplayStyle.showsInlineSummary
}

Expand Down Expand Up @@ -67,8 +71,12 @@ extension SettingsStore {
.appendingPathComponent("archived_sessions", isDirectory: true)
}()

if hasAnyJsonl(in: codexRoot) { return true }
if let archivedCodexRoot, hasAnyJsonl(in: archivedCodexRoot) { return true }
if hasAnyJsonl(in: codexRoot) {
return true
}
if let archivedCodexRoot, hasAnyJsonl(in: archivedCodexRoot) {
return true
}

let claudeRoots: [URL] = {
if let env = env["CLAUDE_CONFIG_DIR"]?.trimmingCharacters(in: .whitespacesAndNewlines),
Expand Down
52 changes: 41 additions & 11 deletions Tests/CodexBarTests/MenuCardDeepSeekTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ struct MenuCardDeepSeekTests {
}

@Test
func `model hides optional deepseek usage when extras disabled`() throws {
func `model hides deepseek usage when extras are disabled despite cost summary enabled`() throws {
let now = Date()
let metadata = try #require(ProviderDefaults.metadata[.deepseek])
let snapshot = Self.makeSnapshot(now: now, usageSummary: Self.sampleDeepSeekSummary(now: now))
Expand All @@ -110,7 +110,7 @@ struct MenuCardDeepSeekTests {
lastError: nil,
usageBarsShowUsed: false,
resetTimeDisplayStyle: .countdown,
tokenCostUsageEnabled: false,
tokenCostUsageEnabled: true,
showOptionalCreditsAndExtraUsage: false,
hidePersonalInfo: false,
now: now))
Expand All @@ -120,7 +120,37 @@ struct MenuCardDeepSeekTests {
}

@Test
func `model explains unavailable optional deepseek usage`() throws {
func `model shows deepseek usage when cost summary and extras are enabled`() throws {
let now = Date()
let metadata = try #require(ProviderDefaults.metadata[.deepseek])
let snapshot = Self.makeSnapshot(now: now, usageSummary: Self.sampleDeepSeekSummary(now: now))

let model = UsageMenuCardView.Model.make(.init(
provider: .deepseek,
metadata: metadata,
snapshot: snapshot,
credits: nil,
creditsError: nil,
dashboard: nil,
dashboardError: nil,
tokenSnapshot: nil,
tokenError: nil,
account: AccountInfo(email: nil, plan: nil),
isRefreshing: false,
lastError: nil,
usageBarsShowUsed: false,
resetTimeDisplayStyle: .countdown,
tokenCostUsageEnabled: true,
showOptionalCreditsAndExtraUsage: true,
hidePersonalInfo: false,
now: now))

#expect(model.inlineUsageDashboard?.accessibilityLabel == "DeepSeek this month token usage trend")
#expect(model.usageNotes.contains { $0.contains("Today:") })
}

@Test
func `model explains unavailable deepseek usage when cost summary is enabled`() throws {
let now = Date()
let metadata = try #require(ProviderDefaults.metadata[.deepseek])
let snapshot = Self.makeSnapshot(now: now)
Expand All @@ -140,7 +170,7 @@ struct MenuCardDeepSeekTests {
lastError: nil,
usageBarsShowUsed: false,
resetTimeDisplayStyle: .countdown,
tokenCostUsageEnabled: false,
tokenCostUsageEnabled: true,
showOptionalCreditsAndExtraUsage: true,
hidePersonalInfo: false,
now: now))
Expand Down Expand Up @@ -170,7 +200,7 @@ struct MenuCardDeepSeekTests {
lastError: nil,
usageBarsShowUsed: false,
resetTimeDisplayStyle: .countdown,
tokenCostUsageEnabled: false,
tokenCostUsageEnabled: true,
showOptionalCreditsAndExtraUsage: true,
hidePersonalInfo: false,
now: now))
Expand Down Expand Up @@ -203,7 +233,7 @@ struct MenuCardDeepSeekTests {
lastError: nil,
usageBarsShowUsed: false,
resetTimeDisplayStyle: .countdown,
tokenCostUsageEnabled: false,
tokenCostUsageEnabled: true,
showOptionalCreditsAndExtraUsage: true,
hidePersonalInfo: false,
now: now))
Expand All @@ -213,7 +243,7 @@ struct MenuCardDeepSeekTests {
}

@Test
func `browser only sign in remains visible when optional usage is hidden`() throws {
func `browser only sign in remains visible when cost summary is disabled`() throws {
let now = Date()
let metadata = try #require(ProviderDefaults.metadata[.deepseek])
let snapshot = DeepSeekUsageSnapshot(
Expand Down Expand Up @@ -272,7 +302,7 @@ struct MenuCardDeepSeekTests {
lastError: nil,
usageBarsShowUsed: false,
resetTimeDisplayStyle: .countdown,
tokenCostUsageEnabled: false,
tokenCostUsageEnabled: true,
showOptionalCreditsAndExtraUsage: true,
hidePersonalInfo: false,
now: now))
Expand All @@ -282,7 +312,7 @@ struct MenuCardDeepSeekTests {
}

@Test
func `model shows optional deepseek usage when extras enabled`() throws {
func `model hides deepseek usage when cost summary is disabled despite extras enabled`() throws {
let now = Date()
let metadata = try #require(ProviderDefaults.metadata[.deepseek])
let snapshot = Self.makeSnapshot(now: now, usageSummary: Self.sampleDeepSeekSummary(now: now))
Expand All @@ -307,7 +337,7 @@ struct MenuCardDeepSeekTests {
hidePersonalInfo: false,
now: now))

#expect(model.inlineUsageDashboard?.accessibilityLabel == "DeepSeek this month token usage trend")
#expect(model.usageNotes.contains { $0.contains("Today:") })
#expect(model.inlineUsageDashboard == nil)
#expect(model.usageNotes.isEmpty)
}
}
29 changes: 28 additions & 1 deletion Tests/CodexBarTests/ProviderSettingsDescriptorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,8 +787,11 @@ extension ProviderSettingsDescriptorTests {
}

@Test
func `deepseek detailed usage runs only for the active api token account`() throws {
func `deepseek detailed usage requires cost extras and active api token account`() throws {
let fixture = try self.makeSettingsFixture(suite: "ProviderSettingsDescriptorTests-deepseek-account-usage")
fixture.settings.showOptionalCreditsAndExtraUsage = true
fixture.settings.costSummaryOption = .inlineSummary
#expect(fixture.settings.costSummaryShowsInlineDashboard(for: .deepseek))
fixture.settings.addTokenAccount(provider: .deepseek, label: "Personal", token: "token-1")
fixture.settings.addTokenAccount(provider: .deepseek, label: "Work", token: "token-2")
let accounts = fixture.settings.tokenAccounts(for: .deepseek)
Expand All @@ -803,6 +806,30 @@ extension ProviderSettingsDescriptorTests {
provider: .deepseek,
settings: fixture.settings,
override: TokenAccountOverride(provider: .deepseek, account: inactive)))
fixture.settings.costSummaryOption = .costSubmenu
#expect(fixture.settings.costSummaryShowsInlineDashboard(for: .deepseek))
#expect(ProviderTokenAccountSelection.shouldIncludeOptionalUsage(
provider: .deepseek,
settings: fixture.settings,
override: TokenAccountOverride(provider: .deepseek, account: active)))
fixture.settings.costSummaryOption = .both
#expect(fixture.settings.costSummaryShowsInlineDashboard(for: .deepseek))
fixture.settings.costSummaryOption = .off
#expect(!fixture.settings.costSummaryShowsInlineDashboard(for: .deepseek))
#expect(!ProviderTokenAccountSelection.shouldIncludeOptionalUsage(
provider: .deepseek,
settings: fixture.settings,
override: TokenAccountOverride(provider: .deepseek, account: active)))
fixture.settings.showOptionalCreditsAndExtraUsage = false
#expect(!ProviderTokenAccountSelection.shouldIncludeOptionalUsage(
provider: .codex,
settings: fixture.settings,
override: nil))
fixture.settings.costSummaryOption = .inlineSummary
#expect(!ProviderTokenAccountSelection.shouldIncludeOptionalUsage(
provider: .deepseek,
settings: fixture.settings,
override: TokenAccountOverride(provider: .deepseek, account: active)))
}

@Test
Expand Down