Skip to content

fix: normalize timezone-aware usage date labels #258

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
robinebers merged 2 commits into from
Mar 4, 2026
Merged

fix: normalize timezone-aware usage date labels #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f10b6c8
fix: normalize timezone-aware usage date labels
sonwr Mar 3, 2026
75d2072
Merge branch 'main' into fix/timezone-usage-label-boundary
davidarny Mar 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
5 changes: 5 additions & 0 deletions plugins/claude/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,11 @@
return isoMatch[1] + "-" + isoMatch[2] + "-" + isoMatch[3]
}

const isoDatePrefixMatch = value.match(/^(\d{4})-(\d{2})-(\d{2})(?:[Tt\s]|$)/)
if (isoDatePrefixMatch) {
return isoDatePrefixMatch[1] + "-" + isoDatePrefixMatch[2] + "-" + isoDatePrefixMatch[3]
}

const compactMatch = value.match(/^(\d{4})(\d{2})(\d{2})$/)
if (compactMatch) {
return compactMatch[1] + "-" + compactMatch[2] + "-" + compactMatch[3]
Expand Down
57 changes: 57 additions & 0 deletions plugins/claude/plugin.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,63 @@ describe("claude plugin", () => {
expect(yesterdayLine.value).toContain("$0.60")
})

it("matches UTC timestamp day keys at month boundary (regression)", async () => {
vi.useFakeTimers()
vi.setSystemTime(new Date(2026, 2, 1, 12, 0, 0))
try {
const ctx = makeProbeCtx({
ccusageResult: okUsage([
{ date: "2026-03-01T12:00:00Z", inputTokens: 10, outputTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0, totalTokens: 10, totalCost: 0.1 },
]),
})
const plugin = await loadPlugin()
const result = plugin.probe(ctx)
const todayLine = result.lines.find((l) => l.label === "Today")
expect(todayLine).toBeTruthy()
expect(todayLine.value).toContain("10 tokens")
} finally {
vi.useRealTimers()
}
})

it("matches UTC+9 timestamp day keys at month boundary (regression)", async () => {
vi.useFakeTimers()
vi.setSystemTime(new Date(2026, 2, 1, 12, 0, 0))
try {
const ctx = makeProbeCtx({
ccusageResult: okUsage([
{ date: "2026-03-01T00:30:00+09:00", inputTokens: 20, outputTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0, totalTokens: 20, totalCost: 0.2 },
]),
})
const plugin = await loadPlugin()
const result = plugin.probe(ctx)
const todayLine = result.lines.find((l) => l.label === "Today")
expect(todayLine).toBeTruthy()
expect(todayLine.value).toContain("20 tokens")
} finally {
vi.useRealTimers()
}
})

it("matches UTC-8 timestamp day keys at day boundary (regression)", async () => {
vi.useFakeTimers()
vi.setSystemTime(new Date(2026, 2, 1, 12, 0, 0))
try {
const ctx = makeProbeCtx({
ccusageResult: okUsage([
{ date: "2026-03-01T23:30:00-08:00", inputTokens: 30, outputTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0, totalTokens: 30, totalCost: 0.3 },
]),
})
const plugin = await loadPlugin()
const result = plugin.probe(ctx)
const todayLine = result.lines.find((l) => l.label === "Today")
expect(todayLine).toBeTruthy()
expect(todayLine.value).toContain("30 tokens")
} finally {
vi.useRealTimers()
}
})

it("adds Last 30 Days line summing all daily entries", async () => {
const todayKey = localDayKey(new Date())
const ctx = makeProbeCtx({
Expand Down
5 changes: 5 additions & 0 deletions plugins/codex/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,11 @@
return isoMatch[1] + "-" + isoMatch[2] + "-" + isoMatch[3]
}

const isoDatePrefixMatch = value.match(/^(\d{4})-(\d{2})-(\d{2})(?:[Tt\s]|$)/)
if (isoDatePrefixMatch) {
return isoDatePrefixMatch[1] + "-" + isoDatePrefixMatch[2] + "-" + isoDatePrefixMatch[3]
}

const compactMatch = value.match(/^(\d{4})(\d{2})(\d{2})$/)
if (compactMatch) {
return compactMatch[1] + "-" + compactMatch[2] + "-" + compactMatch[3]
Expand Down
87 changes: 87 additions & 0 deletions plugins/codex/plugin.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,93 @@ describe("codex plugin", () => {
expect(yesterdayLine.value).toContain("$1.10")
})

it("matches UTC timestamp day keys at month boundary (regression)", async () => {
vi.useFakeTimers()
vi.setSystemTime(new Date(2026, 2, 1, 12, 0, 0))
try {
const ctx = makeCtx()
ctx.host.fs.writeText("~/.codex/auth.json", JSON.stringify({
tokens: { access_token: "token" },
last_refresh: new Date().toISOString(),
}))
ctx.host.http.request.mockReturnValue({
status: 200,
headers: { "x-codex-primary-used-percent": "10" },
bodyText: JSON.stringify({}),
})
ctx.host.ccusage.query.mockReturnValue({
status: "ok",
data: { daily: [{ date: "2026-03-01T12:00:00Z", totalTokens: 10, costUSD: 0.1 }] },
})

const plugin = await loadPlugin()
const result = plugin.probe(ctx)
const todayLine = result.lines.find((line) => line.label === "Today")
expect(todayLine).toBeTruthy()
expect(todayLine.value).toContain("10 tokens")
} finally {
vi.useRealTimers()
}
})

it("matches UTC+9 timestamp day keys at month boundary (regression)", async () => {
vi.useFakeTimers()
vi.setSystemTime(new Date(2026, 2, 1, 12, 0, 0))
try {
const ctx = makeCtx()
ctx.host.fs.writeText("~/.codex/auth.json", JSON.stringify({
tokens: { access_token: "token" },
last_refresh: new Date().toISOString(),
}))
ctx.host.http.request.mockReturnValue({
status: 200,
headers: { "x-codex-primary-used-percent": "10" },
bodyText: JSON.stringify({}),
})
ctx.host.ccusage.query.mockReturnValue({
status: "ok",
data: { daily: [{ date: "2026-03-01T00:30:00+09:00", totalTokens: 20, costUSD: 0.2 }] },
})

const plugin = await loadPlugin()
const result = plugin.probe(ctx)
const todayLine = result.lines.find((line) => line.label === "Today")
expect(todayLine).toBeTruthy()
expect(todayLine.value).toContain("20 tokens")
} finally {
vi.useRealTimers()
}
})

it("matches UTC-8 timestamp day keys at day boundary (regression)", async () => {
vi.useFakeTimers()
vi.setSystemTime(new Date(2026, 2, 1, 12, 0, 0))
try {
const ctx = makeCtx()
ctx.host.fs.writeText("~/.codex/auth.json", JSON.stringify({
tokens: { access_token: "token" },
last_refresh: new Date().toISOString(),
}))
ctx.host.http.request.mockReturnValue({
status: 200,
headers: { "x-codex-primary-used-percent": "10" },
bodyText: JSON.stringify({}),
})
ctx.host.ccusage.query.mockReturnValue({
status: "ok",
data: { daily: [{ date: "2026-03-01T23:30:00-08:00", totalTokens: 30, costUSD: 0.3 }] },
})

const plugin = await loadPlugin()
const result = plugin.probe(ctx)
const todayLine = result.lines.find((line) => line.label === "Today")
expect(todayLine).toBeTruthy()
expect(todayLine.value).toContain("30 tokens")
} finally {
vi.useRealTimers()
}
})

it("throws token expired when refresh fails", async () => {
const ctx = makeCtx()
ctx.host.fs.writeText("~/.codex/auth.json", JSON.stringify({
Expand Down