Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Sources/CodexBar/MenuCardView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1335,7 +1335,7 @@ extension UsageMenuCardView.Model {
{
primaryDetailLeft = detail
}
if [.warp, .kilo, .mimo, .deepseek, .deepinfra, .qoder, .mistral, .neuralwatt, .litellm]
if [.warp, .kilo, .mimo, .deepseek, .deepinfra, .qoder, .mistral, .neuralwatt, .litellm, .chutes]
.contains(input.provider),
let detail = primary.resetDescription,
!detail.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
Expand Down Expand Up @@ -1365,7 +1365,7 @@ extension UsageMenuCardView.Model {
primaryResetText = nil
}
}
if [.warp, .kilo, .mimo, .deepseek, .deepinfra, .qoder, .mistral, .neuralwatt, .litellm, .zenmux]
if [.warp, .kilo, .mimo, .deepseek, .deepinfra, .qoder, .mistral, .neuralwatt, .litellm, .zenmux, .chutes]
.contains(input.provider),
primary.resetsAt == nil
{
Expand Down Expand Up @@ -1483,7 +1483,7 @@ extension UsageMenuCardView.Model {
weeklyResetText = nil
weeklyDetailText = detail
}
if input.provider == .kilo || input.provider == .litellm,
if [.kilo, .litellm, .chutes].contains(input.provider),
let detail = weekly.resetDescription,
!detail.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
{
Expand Down
9 changes: 5 additions & 4 deletions Sources/CodexBar/MenuDescriptor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ struct MenuDescriptor {
let primaryDetail = primary.resetDescription?.trimmingCharacters(in: .whitespacesAndNewlines)
let primaryDescriptionIsDetail = provider == .warp || provider == .kilo || provider == .abacus ||
provider == .deepseek || provider == .deepinfra || provider == .neuralwatt ||
provider == .azureopenai || provider == .mimo || provider == .qoder || provider == .sub2api
provider == .azureopenai || provider == .mimo || provider == .qoder || provider == .sub2api ||
provider == .chutes
let primaryWindow = if primaryDescriptionIsDetail {
// Some providers use resetDescription for non-reset detail
// (e.g., "Unlimited", "X/Y credits"). Avoid rendering it as a "Resets ..." line.
Expand Down Expand Up @@ -280,11 +281,11 @@ struct MenuDescriptor {
if let weekly = snap.secondary {
let weeklyResetOverride: String? = {
guard provider == .warp || provider == .kilo || provider == .perplexity || provider == .crof ||
provider == .sub2api
provider == .sub2api || provider == .chutes
else { return nil }
let detail = weekly.resetDescription?.trimmingCharacters(in: .whitespacesAndNewlines)
guard let detail, !detail.isEmpty else { return nil }
if provider == .kilo, weekly.resetsAt != nil {
if [.kilo, .chutes].contains(provider), weekly.resetsAt != nil {
return nil
}
return detail
Expand All @@ -296,7 +297,7 @@ struct MenuDescriptor {
resetStyle: resetStyle,
showUsed: settings.usageBarsShowUsed,
resetOverride: weeklyResetOverride)
if provider == .kilo,
if [.kilo, .chutes].contains(provider),
weekly.resetsAt != nil,
let detail = weekly.resetDescription?.trimmingCharacters(in: .whitespacesAndNewlines),
!detail.isEmpty
Expand Down
2 changes: 1 addition & 1 deletion Sources/CodexBarCLI/CLIRenderer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ enum CLIRenderer {

private static func usesDetailBackedWindow(provider: UsageProvider) -> Bool {
switch provider {
case .warp, .kilo, .mistral, .deepseek, .deepinfra, .qoder, .crof:
case .warp, .kilo, .mistral, .deepseek, .deepinfra, .qoder, .crof, .chutes:
true
default:
false
Expand Down
145 changes: 145 additions & 0 deletions Tests/CodexBarTests/ChutesPresentationTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
import CodexBarCore
import Foundation
import Testing
@testable import CodexBar
@testable import CodexBarCLI

@MainActor
struct ChutesPresentationTests {
@Test
func `menu card keeps quota detail separate from reset text`() throws {
let now = Date(timeIntervalSince1970: 1_800_000_000)
let metadata = try #require(ProviderDefaults.metadata[.chutes])
let model = UsageMenuCardView.Model.make(.init(
provider: .chutes,
metadata: metadata,
snapshot: Self.snapshot(now: now),
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: false,
showOptionalCreditsAndExtraUsage: true,
hidePersonalInfo: false,
now: now))

let primary = try #require(model.metrics.first { $0.id == "primary" })
#expect(primary.resetText?.hasPrefix("Resets") == true)
#expect(primary.detailText == "40/100 requests")

let secondary = try #require(model.metrics.first { $0.id == "secondary" })
#expect(secondary.resetText == nil)
#expect(secondary.detailText == "250/1000 credits")
}

@Test
func `CLI keeps quota detail separate from reset text`() throws {
let now = Date(timeIntervalSince1970: 1_800_000_000)
let snapshot = Self.snapshot(now: now)
let metadata = ProviderDescriptorRegistry.descriptor(for: .chutes).metadata
let card = CLICardsRenderer.makeCard(CLICardBuildInput(
provider: .chutes,
snapshot: snapshot,
credits: nil,
source: "api",
status: nil,
notes: [],
useColor: false,
resetStyle: .countdown,
weeklyWorkDays: nil,
now: now))

let primary = try #require(card.metrics.first { $0.label == metadata.sessionLabel })
#expect(primary.resetText?.hasPrefix("⏳ Resets") == true)
#expect(primary.detailText == "40/100 requests")

let secondary = try #require(card.metrics.first { $0.label == metadata.weeklyLabel })
#expect(secondary.resetText == nil)
#expect(secondary.detailText == "250/1000 credits")

let output = CLIRenderer.renderText(
provider: .chutes,
snapshot: snapshot,
credits: nil,
context: RenderContext(
header: "Chutes",
status: nil,
useColor: false,
resetStyle: .countdown),
now: now)

#expect(output.contains("40/100 requests"))
#expect(output.contains("250/1000 credits"))
#expect(!output.contains("Resets 40/100 requests"))
#expect(!output.contains("Resets 250/1000 credits"))
}

@Test
func `native menu keeps quota detail separate from reset text`() throws {
let suite = "ChutesPresentationTests-native-menu"
let defaults = try #require(UserDefaults(suiteName: suite))
defaults.removePersistentDomain(forName: suite)
defer { defaults.removePersistentDomain(forName: suite) }

let settings = SettingsStore(
userDefaults: defaults,
configStore: testConfigStore(suiteName: suite),
zaiTokenStore: NoopZaiTokenStore(),
syntheticTokenStore: NoopSyntheticTokenStore())
settings.statusChecksEnabled = false

let store = UsageStore(
fetcher: UsageFetcher(environment: [:]),
browserDetection: BrowserDetection(cacheTTL: 0),
settings: settings)
store._setSnapshotForTesting(Self.snapshot(now: Date()), provider: .chutes)

let descriptor = MenuDescriptor.build(
provider: .chutes,
store: store,
settings: settings,
account: AccountInfo(email: nil, plan: nil),
updateReady: false,
includeContextualActions: false)
let textLines = descriptor.sections
.flatMap(\.entries)
.compactMap { entry -> String? in
guard case let .text(text, _) = entry else { return nil }
return text
}

#expect(textLines.contains("40/100 requests"))
#expect(textLines.contains("250/1000 credits"))
#expect(textLines.contains { $0.hasPrefix("Resets") })
#expect(!textLines.contains { $0.contains("Resets 40/100 requests") })
#expect(!textLines.contains { $0.contains("Resets 250/1000 credits") })
}

private static func snapshot(now: Date) -> UsageSnapshot {
UsageSnapshot(
primary: RateWindow(
usedPercent: 40,
windowMinutes: 240,
resetsAt: now.addingTimeInterval(60 * 60),
resetDescription: "40/100 requests"),
secondary: RateWindow(
usedPercent: 25,
windowMinutes: 30 * 24 * 60,
resetsAt: nil,
resetDescription: "250/1000 credits"),
tertiary: nil,
updatedAt: now,
identity: ProviderIdentitySnapshot(
providerID: .chutes,
accountEmail: nil,
accountOrganization: nil,
loginMethod: "Pro"))
}
}