Skip to content

perf(codex): skip out-of-range date directories when --since/--until is set #877

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
jleechan2015 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

perf(codex): skip out-of-range date directories when --since/--until is set #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e53a085
perf(codex): skip out-of-range date directories when --since/--until …
Mar 6, 2026
9c587b3
fix(codex): include root-level *.jsonl files in date-filtered runs
Mar 9, 2026
809a2ae
test(codex): add coverage for root-level flat files with date filters
Mar 9, 2026
e4fd685
perf(ccusage): skip Claude session files whose mtime precedes --since
Mar 9, 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
96 changes: 86 additions & 10 deletions apps/ccusage/src/data-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type { LoadedUsageEntry, SessionBlock } from './_session-blocks.ts';
import type { ActivityDate, Bucket, CostMode, ModelName, SortOrder, Version } from './_types.ts';
import { Buffer } from 'node:buffer';
import { createReadStream, createWriteStream } from 'node:fs';
import { readFile } from 'node:fs/promises';
import { readFile, stat } from 'node:fs/promises';
import path from 'node:path';
import process from 'node:process';
import { createInterface } from 'node:readline';
Expand Down Expand Up @@ -698,20 +698,64 @@ export type GlobResult = {
};

/**
* Glob files from multiple Claude paths in parallel
* Convert a YYYYMMDD string to a Date at midnight local time.
*/
function parseDateKey(yyyymmdd: string): Date {
const year = Number.parseInt(yyyymmdd.slice(0, 4), 10);
const month = Number.parseInt(yyyymmdd.slice(4, 6), 10) - 1;
const day = Number.parseInt(yyyymmdd.slice(6, 8), 10);
return new Date(year, month, day);
}
Comment on lines +703 to +708
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Mar 9, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
rg -nP '\bctx\.values\.(since|until)\b|\b(since|until)\b.*replace(All)?\(|type DateFilter|filterByDateRange\(' apps/ccusage/src -g '*.ts'

Repository: ryoppippi/ccusage

Length of output: 1146

🏁 Script executed:

#!/bin/bash
# Get the DateFilter type definition and LoadOptions around line 766
sed -n '766,800p' apps/ccusage/src/data-loader.ts

# Find where parseDateKey is called
rg -n 'parseDateKey' apps/ccusage/src -g '*.ts' -B 2 -A 2

# Check how since/until parameters are defined in commands
grep -n 'since\|until' apps/ccusage/src/commands/session.ts | head -20
grep -n 'since\|until' apps/ccusage/src/commands/blocks.ts | head -20

Repository: ryoppippi/ccusage

Length of output: 2575

🏁 Script executed:

#!/bin/bash
# Look for command parameter definitions for since/until
grep -n -B 5 -A 5 'since.*until\|until.*since' apps/ccusage/src/commands/session.ts | head -40
grep -n -B 5 -A 5 'since.*until\|until.*since' apps/ccusage/src/commands/blocks.ts | head -40

# Check if there are any date parsing/normalization in command setup
grep -n 'parseDate\|Date\.parse\|date.*parse\|ISO\|format' apps/ccusage/src/commands/session.ts
grep -n 'parseDate\|Date\.parse\|date.*parse\|ISO\|format' apps/ccusage/src/commands/blocks.ts

# Look at the full context around since/until in session.ts
sed -n '60,85p' apps/ccusage/src/commands/session.ts

Repository: ryoppippi/ccusage

Length of output: 3260

🏁 Script executed:

#!/bin/bash
# Find where the since/until parameters are defined in the command setup
grep -n -B 15 'ctx.values.since' apps/ccusage/src/commands/session.ts | grep -A 15 'option\|param\|since\|until' | head -50

# Look for parameter definitions in blocks.ts as well
grep -n -B 15 'ctx.values.since' apps/ccusage/src/commands/blocks.ts | grep -A 15 'option\|param\|since\|until' | head -50

# Try searching for where since/until are declared as command parameters
rg -n 'name.*since|name.*until|key.*since|key.*until' apps/ccusage/src/commands -g '*.ts' -B 2 -A 5

Repository: ryoppippi/ccusage

Length of output: 123

🏁 Script executed:

#!/bin/bash
# Get the full session.ts file structure to see where params are defined
head -150 apps/ccusage/src/commands/session.ts | tail -100

# Look for create/createCommand patterns and options definitions
rg -n 'createCommand|option|param' apps/ccusage/src/commands/session.ts | head -20

Repository: ryoppippi/ccusage

Length of output: 2900

🏁 Script executed:

#!/bin/bash
# Look at the beginning of session.ts to see imports and command setup
head -80 apps/ccusage/src/commands/session.ts

# Search for where options are defined - maybe they're from a shared utility
rg -n 'export.*option|export.*param' apps/ccusage/src/commands -g '*.ts'

# Look for any shared command options file
find apps/ccusage/src/commands -name '*option*' -o -name '*param*'

Repository: ryoppippi/ccusage

Length of output: 2537

🏁 Script executed:

#!/bin/bash
# Find the _shared-args file
find apps/ccusage/src -name '*shared*args*' -o -name '_shared*'

# Look at the shared args file
cat apps/ccusage/src/_shared-args.ts

# Also check what sharedCommandConfig contains
rg -n 'sharedCommandConfig' apps/ccusage/src/_shared-args.ts -A 30

Repository: ryoppippi/ccusage

Length of output: 3360

🏁 Script executed:

#!/bin/bash
# Check the filterDateSchema definition
grep -n 'filterDateSchema' apps/ccusage/src/_types.ts -B 5 -A 10

# Also look for the full valibot schema definition
rg -n 'export.*filterDateSchema|const.*filterDateSchema' apps/ccusage/src -g '*.ts' -A 10

Repository: ryoppippi/ccusage

Length of output: 4901

🏁 Script executed:

#!/bin/bash
# Check all usages of parseDateKey to see if there are other callers
rg -n 'parseDateKey' apps/ccusage/src -g '*.ts' -B 3 -A 3

# Check the test at lines 4746-4769
sed -n '4745,4770p' apps/ccusage/src/data-loader.ts

Repository: ryoppippi/ccusage

Length of output: 2174

🏁 Script executed:

#!/bin/bash
# Verify that parseDateKey is only called with validated input
# Search for all function calls to parseDateKey
rg -n 'parseDateKey\(' apps/ccusage/src -g '*.ts'

# Verify that since/until only come from the validated command-line parameters or DateFilter type
# Check if DateFilter type is used anywhere else
rg -n 'DateFilter\|since.*:.*string\|until.*:.*string' apps/ccusage/src -g '*.ts' -B 2 -A 2 | head -50

# Check if there's any other way since/until are set besides the command parsing
rg -n '\bsince\s*:\s*|\.since\s*=' apps/ccusage/src -g '*.ts' | head -20

Repository: ryoppippi/ccusage

Length of output: 1329

🏁 Script executed:

#!/bin/bash
# Get full test code to see how it's structured
sed -n '4746,4770p' apps/ccusage/src/data-loader.ts

Repository: ryoppippi/ccusage

Length of output: 1184

🏁 Script executed:

#!/bin/bash
# Check how fs imports are typically handled in this file
grep -n "import.*fs\|from.*node:fs" apps/ccusage/src/data-loader.ts | head -10

# Also check if fs is already imported elsewhere in the file
head -100 apps/ccusage/src/data-loader.ts | grep -n "import"

Repository: ryoppippi/ccusage

Length of output: 1540

Remove dynamic import of node:fs/promises and add utimes to the top-level import.

Line 4747 uses await import('node:fs/promises') to get utimes, which violates the no-dynamic-imports constraint for apps/ccusage/**/*.ts. Since readFile and stat are already imported from node:fs/promises at line 16, add utimes to that import statement instead.

-import { readFile, stat } from 'node:fs/promises';
+import { readFile, stat, utimes } from 'node:fs/promises';

Then replace the dynamic import in the test:

 it('skips files whose mtime is more than one day before since', async () => {
-	const { utimes } = await import('node:fs/promises');
-
 	await using fixture = await createFixture({
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@apps/ccusage/src/data-loader.ts` around lines 703 - 708, Top-level imports
currently include readFile and stat from 'node:fs/promises' but tests use await
import('node:fs/promises') to get utimes; update the static import to also
import utimes (add utimes to the existing import list that contains readFile and
stat) and remove the dynamic import usage—replace any await
import('node:fs/promises') calls with direct references to utimes from the
top-level import (ensure code that used the dynamic import now calls utimes()
directly).


/**
* Filter files by filesystem mtime using a 1-day buffer before `since`.
*
* Claude session files have no date directory hierarchy, so we rely on mtime
* (last write time) as a cheap O(stat) proxy. A file whose mtime is more than
* one day before `since` cannot contain entries in [since, ∞) — skip it.
* The 1-day buffer absorbs timezone differences between local clock and UTC.
*
* `until` is intentionally NOT used for mtime pruning: a file updated after
* `until` may still contain entries from before `until`.
*/
async function filterFilesByMtime(files: string[], since: string | undefined): Promise<string[]> {
if (since == null) {
return files;
}
const threshold = parseDateKey(since).getTime() - 24 * 60 * 60 * 1000;
const results = await Promise.all(
files.map(async (file) => {
try {
const { mtimeMs } = await stat(file);
return mtimeMs >= threshold ? file : null;
} catch {
return file; // Include on stat error to avoid silent data loss
}
}),
);
return results.filter((f): f is string => f !== null);
}

/**
* Glob files from multiple Claude paths in parallel, optionally pruning by mtime.
* @param claudePaths - Array of Claude base paths
* @param filter - Optional date range; `since` is used to skip stale files via mtime
* @returns Array of file paths with their base directories
*/
export async function globUsageFiles(claudePaths: string[]): Promise<GlobResult[]> {
export async function globUsageFiles(
claudePaths: string[],
filter?: DateFilter,
): Promise<GlobResult[]> {
const filePromises = claudePaths.map(async (claudePath) => {
const claudeDir = path.join(claudePath, CLAUDE_PROJECTS_DIR_NAME);
const files = await glob([USAGE_DATA_GLOB_PATTERN], {
cwd: claudeDir,
absolute: true,
}).catch(() => []); // Gracefully handle errors for individual paths

const filtered = await filterFilesByMtime(files, filter?.since);
// Map each file to include its base directory
return files.map((file) => ({ file, baseDir: claudeDir }));
return filtered.map((file) => ({ file, baseDir: claudeDir }));
});
return (await Promise.all(filePromises)).flat();
}
Expand Down Expand Up @@ -750,8 +794,11 @@ export async function loadDailyUsageData(options?: LoadOptions): Promise<DailyUs
// Get all Claude paths or use the specific one from options
const claudePaths = toArray(options?.claudePath ?? getClaudePaths());

// Collect files from all paths in parallel
const allFiles = await globUsageFiles(claudePaths);
// Collect files from all paths in parallel, pruning by mtime when since is set
const allFiles = await globUsageFiles(claudePaths, {
since: options?.since,
until: options?.until,
});
const fileList = allFiles.map((f) => f.file);

if (fileList.length === 0) {
Expand Down Expand Up @@ -899,8 +946,11 @@ export async function loadSessionData(options?: LoadOptions): Promise<SessionUsa
// Get all Claude paths or use the specific one from options
const claudePaths = toArray(options?.claudePath ?? getClaudePaths());

// Collect files from all paths with their base directories in parallel
const filesWithBase = await globUsageFiles(claudePaths);
// Collect files from all paths with their base directories in parallel, pruning by mtime
const filesWithBase = await globUsageFiles(claudePaths, {
since: options?.since,
until: options?.until,
});

if (filesWithBase.length === 0) {
return [];
Expand Down Expand Up @@ -1345,15 +1395,16 @@ export async function loadSessionBlockData(options?: LoadOptions): Promise<Sessi
// Get all Claude paths or use the specific one from options
const claudePaths = toArray(options?.claudePath ?? getClaudePaths());

// Collect files from all paths
// Collect files from all paths, pruning by mtime when since is set
const allFiles: string[] = [];
for (const claudePath of claudePaths) {
const claudeDir = path.join(claudePath, CLAUDE_PROJECTS_DIR_NAME);
const files = await glob([USAGE_DATA_GLOB_PATTERN], {
cwd: claudeDir,
absolute: true,
});
allFiles.push(...files);
const filtered = await filterFilesByMtime(files, options?.since);
allFiles.push(...filtered);
}

if (allFiles.length === 0) {
Expand Down Expand Up @@ -4691,6 +4742,31 @@ if (import.meta.vitest != null) {
expect(results).toHaveLength(3);
expect(results.every((r) => r.baseDir.includes(path.join('path1', 'projects')))).toBe(true);
});

it('skips files whose mtime is more than one day before since', async () => {
const { utimes } = await import('node:fs/promises');

await using fixture = await createFixture({
'base/projects/proj/old/usage.jsonl': 'old-data',
'base/projects/proj/new/usage.jsonl': 'new-data',
});

const oldFile = fixture.getPath('base/projects/proj/old/usage.jsonl');
const newFile = fixture.getPath('base/projects/proj/new/usage.jsonl');

// Set old file mtime to 5 days before since, new file mtime to 1 day before since.
const since = new Date('2026-03-05');
const oldMtime = new Date(since.getTime() - 5 * 24 * 60 * 60 * 1000);
const newMtime = new Date(since.getTime() - 12 * 60 * 60 * 1000); // 12h before (within buffer)
await utimes(oldFile, oldMtime, oldMtime);
await utimes(newFile, newMtime, newMtime);

const results = await globUsageFiles([fixture.getPath('base')], { since: '20260305' });

// Old file (5d before since) should be pruned; new file (12h before, within 1d buffer) kept.
expect(results).toHaveLength(1);
expect(results[0]!.file).toContain('new');
});
Comment on lines +4746 to +4769
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Mar 9, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
rg -nP 'await\s+import\s*\(' apps/ccusage/src -g '*.ts'

Repository: ryoppippi/ccusage

Length of output: 339

🏁 Script executed:

head -50 apps/ccusage/src/data-loader.ts

Repository: ryoppippi/ccusage

Length of output: 1751

🏁 Script executed:

sed -n '1575,1585p' apps/ccusage/src/data-loader.ts

Repository: ryoppippi/ccusage

Length of output: 295

🏁 Script executed:

sed -n '4773,4783p' apps/ccusage/src/data-loader.ts

Repository: ryoppippi/ccusage

Length of output: 568

Replace all dynamic imports in this file with static imports.

This file uses await import() three times (lines 1580, 4747, and 4778), which violates the repo's policy in apps/ccusage/**/*.ts. Both node:fs/promises and fs-fixture are already statically imported at the top of the file, so these should be used instead:

Suggested fixes

Line 4747 — add utimes to the existing import:

-import { readFile, stat } from 'node:fs/promises';
+import { readFile, stat, utimes } from 'node:fs/promises';

Lines 1580 and 4778 — remove the dynamic imports since createFixture is already statically imported:

 describe('loadSessionUsageById', async () => {
-	const { createFixture } = await import('fs-fixture');
 describe('calculateContextTokens', async () => {
-	const { createFixture } = await import('fs-fixture');
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@apps/ccusage/src/data-loader.ts` around lines 4746 - 4769, The tests use
dynamic imports for node:fs/promises and createFixture; replace those with the
existing static imports: add utimes to the top-of-file import that already
imports from 'node:fs/promises' and remove the three await import(...) calls
(the ones that import { utimes } at line ~4747 and the two that import
createFixture at ~1580 and ~4778), then update references to use the statically
imported utimes and createFixture symbols directly (no await import). Ensure
globUsageFiles and related test logic remain unchanged.

});

// Test for calculateContextTokens
Expand Down
2 changes: 1 addition & 1 deletion apps/codex/src/commands/daily.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const dailyCommand = define({
process.exit(1);
}

const { events, missingDirectories } = await loadTokenUsageEvents();
const { events, missingDirectories } = await loadTokenUsageEvents({ since, until });

for (const missing of missingDirectories) {
logger.warn(`Codex session directory not found: ${missing}`);
Expand Down
2 changes: 1 addition & 1 deletion apps/codex/src/commands/monthly.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const monthlyCommand = define({
process.exit(1);
}

const { events, missingDirectories } = await loadTokenUsageEvents();
const { events, missingDirectories } = await loadTokenUsageEvents({ since, until });

for (const missing of missingDirectories) {
logger.warn(`Codex session directory not found: ${missing}`);
Expand Down
2 changes: 1 addition & 1 deletion apps/codex/src/commands/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const sessionCommand = define({
process.exit(1);
}

const { events, missingDirectories } = await loadTokenUsageEvents();
const { events, missingDirectories } = await loadTokenUsageEvents({ since, until });

for (const missing of missingDirectories) {
logger.warn(`Codex session directory not found: ${missing}`);
Expand Down
165 changes: 160 additions & 5 deletions apps/codex/src/data-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { TokenUsageDelta, TokenUsageEvent } from './_types.ts';
import { readFile, stat } from 'node:fs/promises';
import { readdir, readFile, stat } from 'node:fs/promises';
import path from 'node:path';
import process from 'node:process';
import { Result } from '@praha/byethrow';
Expand Down Expand Up @@ -177,14 +177,87 @@ function asNonEmptyString(value: unknown): string | undefined {

export type LoadOptions = {
sessionDirs?: string[];
since?: string;
until?: string;
};

/**
* List session JSONL files, skipping date directories outside [since, until].
*
* Codex stores sessions as `YYYY/MM/DD/*.jsonl`. When a date range is provided
* we enumerate the directory tree and prune entire year/month/day subtrees that
* cannot contain matching sessions, avoiding the cost of a full recursive glob
* over potentially large historical archives.
*/
async function listSessionFiles(
sessionsDir: string,
since: string | undefined,
until: string | undefined,
): Promise<string[]> {
if (since == null && until == null) {
return glob(SESSION_GLOB, { cwd: sessionsDir, absolute: true });
}

const sinceKey = since?.replaceAll('-', '');
const untilKey = until?.replaceAll('-', '');

Comment on lines +192 to +203
Copy link

Copilot AI Mar 6, 2026

Choose a reason for hiding this comment

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

listSessionFiles() introduces new range-pruning behavior but there are no tests exercising it (e.g., that it returns only files within [since, until], and that it still includes root-level .jsonl files if they exist). Since this file already contains vitest coverage for loadTokenUsageEvents, adding a focused test case that sets since/until and uses a dated YYYY/MM/DD fixture directory structure would help prevent regressions in the pruning logic.

Copilot uses AI. Check for mistakes.
const tryReaddir = async (dir: string): Promise<string[]> => {
const result = await Result.try({
try: readdir(dir),
catch: (error) => error,
});
return Result.isFailure(result) ? [] : result.value;
};

// Preserve support for legacy flat layouts: include any *.jsonl files
// stored directly under sessionsDir (not inside YYYY/MM/DD subdirs).
const rootFiles = await glob('*.jsonl', { cwd: sessionsDir, absolute: true }).catch(() => []);
const files: string[] = [...rootFiles];

for (const year of (await tryReaddir(sessionsDir)).filter((e) => /^\d{4}$/.test(e))) {
if (sinceKey != null && `${year}1231` < sinceKey) {
continue;
}
if (untilKey != null && `${year}0101` > untilKey) {
Comment on lines +217 to +221
Copy link

Copilot AI Mar 6, 2026

Choose a reason for hiding this comment

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

When since/until is set, this implementation only traverses YYYY/MM/DD subdirectories and will ignore any .jsonl files stored directly under sessionsDir (or under non-date subdirs). The existing vitest fixtures in this file create sessions/project-1.jsonl and sessions/legacy.jsonl at the root, so running loadTokenUsageEvents({ since, until }) against a flat layout would incorrectly return no events. Consider also including glob('*.jsonl', { cwd: sessionsDir, absolute: true }) (and/or a small non-recursive fallback) alongside the pruned traversal so date filters don’t break non-date session layouts.

Copilot uses AI. Check for mistakes.
continue;
}

const yearDir = path.join(sessionsDir, year);
for (const month of (await tryReaddir(yearDir)).filter((e) => /^\d{2}$/.test(e))) {
if (sinceKey != null && `${year + month}31` < sinceKey) {
continue;
}
if (untilKey != null && `${year + month}01` > untilKey) {
continue;
}

const monthDir = path.join(yearDir, month);
for (const day of (await tryReaddir(monthDir)).filter((e) => /^\d{2}$/.test(e))) {
const dateKey = year + month + day;
if (sinceKey != null && dateKey < sinceKey) {
continue;
}
if (untilKey != null && dateKey > untilKey) {
continue;
}

const dayDir = path.join(monthDir, day);
const dayFiles = await glob('*.jsonl', { cwd: dayDir, absolute: true }).catch(() => []);
files.push(...dayFiles);
}
}
}

return files;
}

export type LoadResult = {
events: TokenUsageEvent[];
missingDirectories: string[];
};

export async function loadTokenUsageEvents(options: LoadOptions = {}): Promise<LoadResult> {
const { since, until } = options;
const providedDirs =
options.sessionDirs != null && options.sessionDirs.length > 0
? options.sessionDirs.map((dir) => path.resolve(dir))
Expand Down Expand Up @@ -216,10 +289,7 @@ export async function loadTokenUsageEvents(options: LoadOptions = {}): Promise<L
continue;
}

const files = await glob(SESSION_GLOB, {
cwd: directoryPath,
absolute: true,
});
const files = await listSessionFiles(directoryPath, since, until);

for (const file of files) {
const relativeSessionPath = path.relative(directoryPath, file);
Expand Down Expand Up @@ -453,6 +523,91 @@ if (import.meta.vitest != null) {
expect(second.cachedInputTokens).toBe(100);
});

it('skips date directories outside the since/until range', async () => {
const makeEvent = (timestamp: string, input_tokens: number) =>
JSON.stringify({
timestamp,
type: 'event_msg',
payload: {
type: 'token_count',
info: {
last_token_usage: {
input_tokens,
cached_input_tokens: 0,
output_tokens: 100,
reasoning_output_tokens: 0,
total_tokens: input_tokens + 100,
},
model: 'gpt-5',
},
},
});

// Fixture mirrors real Codex layout: YYYY/MM/DD/*.jsonl
await using fixture = await createFixture({
'2025': {
'12': {
'31': { 'old.jsonl': makeEvent('2025-12-31T12:00:00.000Z', 999) },
},
},
'2026': {
'03': {
'01': { 'new.jsonl': makeEvent('2026-03-01T12:00:00.000Z', 1_000) },
},
},
});

// With since=2026-03-01 the 2025/12/31 file should be skipped entirely.
const { events } = await loadTokenUsageEvents({
sessionDirs: [fixture.getPath('.')],
since: '2026-03-01',
});

expect(events).toHaveLength(1);
expect(events[0]!.inputTokens).toBe(1_000);
});

it('includes root-level *.jsonl files when date filters are active', async () => {
const makeEvent = (timestamp: string, input_tokens: number) =>
JSON.stringify({
timestamp,
type: 'event_msg',
payload: {
type: 'token_count',
info: {
last_token_usage: {
input_tokens,
cached_input_tokens: 0,
output_tokens: 100,
reasoning_output_tokens: 0,
total_tokens: input_tokens + 100,
},
model: 'gpt-5',
},
},
});

// Mix of flat root-level file (legacy layout) and dated subdir file.
await using fixture = await createFixture({
'flat.jsonl': makeEvent('2026-03-05T10:00:00.000Z', 500),
'2026': {
'03': {
'05': { 'dated.jsonl': makeEvent('2026-03-05T11:00:00.000Z', 1_000) },
},
},
});

// With since set, both the flat file and the dated file should be returned.
const { events } = await loadTokenUsageEvents({
sessionDirs: [fixture.getPath('.')],
since: '2026-03-01',
});

expect(events).toHaveLength(2);
const tokens = events.map((e) => e.inputTokens).sort((a, b) => a - b);
expect(tokens).toEqual([500, 1_000]);
});

it('falls back to legacy model when metadata is missing entirely', async () => {
await using fixture = await createFixture({
sessions: {
Expand Down