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
67 changes: 67 additions & 0 deletions apps/server/src/usage/UsageService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,73 @@ describe("Codex usage history", () => {
});

describe("UsageService", () => {
it.effect("keeps pricing metadata paired with the rates used during a concurrent refresh", () =>
Effect.gen(function* () {
const { home, settings } = yield* setup;
const sessions = NodePath.join(home, "codex", "sessions");
yield* Effect.promise(async () => {
await NodeFSP.mkdir(sessions, { recursive: true });
await NodeFSP.writeFile(
NodePath.join(sessions, "session.jsonl"),
[
{ type: "session_meta", payload: { id: "session", model_provider: "openai" } },
{ type: "turn_context", payload: { model: "gpt-6-astra", turn_id: "turn" } },
{
type: "event_msg",
timestamp: "2026-08-01T10:00:00Z",
payload: {
type: "token_count",
info: { last_token_usage: { input_tokens: 0, output_tokens: 1 } },
},
},
]
.map((record) => encodeUnknownJsonString(record))
.join("\n") + "\n",
);
});
let rate = 0;
yield* Effect.gen(function* () {
const resolving = yield* Deferred.make<void>();
const release = yield* Deferred.make<void>();
const service = yield* UsageService.make.pipe(
Effect.provideService(CodexUsageHistory.CodexUsageHistory, {
resolve: () =>
Deferred.succeed(resolving, undefined).pipe(
Effect.andThen(Deferred.await(release)),
Effect.as(new Map()),
),
}),
);
const initialPricing = yield* service.refreshRates;
yield* TestClock.adjust(61_000);
const pending = yield* service.readSummary(WINDOW).pipe(Effect.forkChild);
yield* Deferred.await(resolving);
yield* service.refreshRates;
yield* Deferred.succeed(release, undefined);
const original = yield* Fiber.join(pending);
assert.strictEqual(original.buckets[0]?.costUsd, 1);
assert.strictEqual(original.pricing.fetchedAt, initialPricing.fetchedAt);
const updated = yield* service.readSummary(WINDOW);
assert.strictEqual(updated.buckets[0]?.costUsd, 2);
assert.notStrictEqual(updated.pricing.fetchedAt, initialPricing.fetchedAt);
}).pipe(
Effect.provide(
layerService({
prefix: "concurrent-rates",
home,
settings,
ratesResponse: () =>
Effect.succeed(
Response.json({
"gpt-6-astra": { input_cost_per_token: 0, output_cost_per_token: ++rate },
}),
),
}),
),
);
}).pipe(Effect.scoped),
);

it.effect("counts compressed Codex rollouts across refresh, rewrites, and cache restarts", () =>
Effect.gen(function* () {
const { home, settings } = yield* setup;
Expand Down
3 changes: 2 additions & 1 deletion apps/server/src/usage/UsageService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,7 @@ export const make = Effect.gen(function* () {
{ concurrency: 2 },
);

const summaryPricing = pricing();
const aggregator = new UsageAggregator({
timeZone: input.timeZone,
sinceDay: input.sinceDay,
Expand Down Expand Up @@ -1116,7 +1117,7 @@ export const make = Effect.gen(function* () {
untilDay: input.untilDay,
buckets: aggregated.buckets,
sources,
pricing: pricing(),
pricing: summaryPricing,
scanDurationMs: Math.max(0, finishedAtMs - startedAtMs),
...(input.modelFilter === undefined ? {} : { modelFilter: input.modelFilter }),
} satisfies UsageSummary;
Expand Down
Loading