Skip to content

fix(quota): preserve delimiters in card selections #60

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
Nanako0129 merged 1 commit into from
Jul 17, 2026
Merged

fix(quota): preserve delimiters in card selections #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 24 additions & 4 deletions Sources/TokenBar/SelfTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,8 @@ enum SelfTest {
{"generatedAt":"now","agents":[
{"clientId":"codex","source":"oauth","updatedAt":"now",
"windows":[{"cardId":"session.v1","label":"Session","usedPercent":20,"remainingPercent":80},
{"cardId":"weekly.v1","label":"Weekly","usedPercent":65,"remainingPercent":35}]},
{"cardId":"weekly.v1","label":"Weekly","usedPercent":65,"remainingPercent":35},
{"cardId":"model.gpt|preview.v1","label":"Delimiter","usedPercent":5,"remainingPercent":95}]},
{"clientId":"claude","source":"oauth","updatedAt":"now",
"windows":[{"cardId":"session.v1","label":"Session","usedPercent":88,"remainingPercent":12},
{"cardId":"weekly.v1","label":"Weekly","usedPercent":10,"remainingPercent":90}]},
Expand All @@ -541,6 +542,15 @@ enum SelfTest {
expect(
QuotaResolver.selection(clientId: "codex", cardId: "weekly.v1") == "codex|weekly.v1",
"canonical selection stores cardId")
let delimiterSelection = QuotaResolver.selection(
clientId: "codex", cardId: "model.gpt|preview.v1")
expect(
delimiterSelection == "codex|model.gpt|preview.v1"
&& QuotaResolver.canonicalSelection(
payload: quotaPayload, selection: delimiterSelection) == delimiterSelection
&& QuotaResolver.resolve(payload: quotaPayload, selection: delimiterSelection)?
.window.cardId == "model.gpt|preview.v1",
"card selection preserves delimiters inside cardId")
expect(
QuotaResolver.canonicalSelection(payload: quotaPayload, selection: "codex|Weekly")
== "codex|weekly.v1"
Expand All @@ -567,14 +577,24 @@ enum SelfTest {
"temporarily absent explicit client stays selected instead of following Auto")
expect(
QuotaResolver.canonicalSelection(payload: quotaPayload, selection: "codex|Weekly|extra")
== QuotaResolver.auto,
"malformed selection normalizes to Auto")
== "codex|Weekly|extra"
&& QuotaResolver.resolve(
payload: quotaPayload, selection: "codex|Weekly|extra") == nil,
"unmatched explicit selection preserves delimiter characters")
expect(
QuotaResolver.canonicalSelection(payload: nil, selection: "future|legacy-card.v1")
== "future|legacy-card.v1"
&& QuotaResolver.canonicalSelection(payload: nil, selection: "future|legacy|extra")
== "future|legacy|extra",
"payload nil preserves explicit selection delimiters")
expect(
QuotaResolver.canonicalSelection(payload: quotaPayload, selection: "future")
== QuotaResolver.auto
&& QuotaResolver.canonicalSelection(payload: quotaPayload, selection: "|card")
== QuotaResolver.auto
&& QuotaResolver.canonicalSelection(payload: quotaPayload, selection: "future|")
== QuotaResolver.auto,
"payload nil preserves well-formed explicit selection")
"structurally malformed selections normalize to Auto")
expect(QuotaResolver.resolve(payload: nil, selection: "auto") == nil, "no payload, no quota")

let duplicateJSON = """
Expand Down
3 changes: 2 additions & 1 deletion Sources/TokenBarCore/QuotaResolver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ public enum QuotaResolver {
_ raw: String
) -> (clientId: String, value: String)? {
guard !raw.isEmpty, raw != auto else { return nil }
let parts = raw.split(separator: "|", omittingEmptySubsequences: false)
let parts = raw.split(
separator: "|", maxSplits: 1, omittingEmptySubsequences: false)
guard parts.count == 2 else { return nil }
let clientId = String(parts[0])
let value = String(parts[1])
Expand Down