Skip to content

Commit 7e3e129

Browse files
fix(usage): saved usage answers need a fully readable cache and separate directories
- Coverage is restored only when every saved file decoded, so a partly corrupt cache no longer answers with part of its usage. - Two providers reading the same directory never answer from memory, since the path-keyed cache holds only one provider's parse of each file. - A failed saved-answer request falls back to the plain read. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 3314b2c commit 7e3e129

4 files changed

Lines changed: 51 additions & 6 deletions

File tree

‎apps/server/src/usage/UsageService.test.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2495,6 +2495,23 @@ describe("UsageService", () => {
24952495
});
24962496
assert.strictEqual(totalOutputTokens(unseen), 11);
24972497
yield* restarted.awaitPersisted;
2498+
2499+
// A saved scan with an entry this server cannot read covers nothing.
2500+
const { stateDir } = yield* ServerConfig.ServerConfig;
2501+
const cachePath = NodePath.join(stateDir, SCAN_CACHE_FILE_NAME);
2502+
yield* Effect.promise(async () => {
2503+
const document = decodeUnknownJsonString(await NodeFSP.readFile(cachePath, "utf8")) as {
2504+
files: Record<string, Record<string, unknown>>;
2505+
};
2506+
const [entry] = Object.values(document.files);
2507+
document.files[NodePath.join(NodePath.dirname(transcript), "broken.jsonl")] = {
2508+
...entry,
2509+
r: "broken",
2510+
};
2511+
await NodeFSP.writeFile(cachePath, JSON.stringify(document));
2512+
});
2513+
const reloaded = yield* UsageService.make;
2514+
assert.isUndefined(claude(yield* reloaded.readSummary(provisional))?.refreshing);
24982515
}).pipe(
24992516
Effect.scoped,
25002517
Effect.provide(layerService({ prefix: "usage-service-provisional", home, settings })),

‎apps/server/src/usage/UsageService.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -413,15 +413,17 @@ export const make = Effect.gen(function* () {
413413
cacheDirty = document !== null;
414414
}
415415
if (document === null) return;
416-
for (const [path, entry] of decodeScanCache(document, transcriptFormats)) {
417-
fileCache.set(path, entry);
418-
}
416+
const decoded = decodeScanCache(document, transcriptFormats);
417+
for (const [path, entry] of decoded) fileCache.set(path, entry);
418+
const saved = (document as { readonly files?: unknown }).files;
419+
const complete =
420+
typeof saved === "object" && saved !== null && Object.keys(saved).length === decoded.size;
419421
const sources = decodeCachedSources(document);
420422
if (Option.isSome(sources)) {
421423
for (const [key, source] of Object.entries(sources.value.sources))
422424
sourceCache.set(key, source);
423-
// Coverage describes the saved files; an older version's files may parse differently.
424-
if (current && fileCache.size > 0) {
425+
// Coverage describes the saved files, so it needs every one, in this version's format.
426+
if (current && complete && fileCache.size > 0) {
425427
for (const [key, since] of Object.entries(sources.value.coveredSince ?? {}))
426428
coveredSince.set(key, since);
427429
}
@@ -794,9 +796,11 @@ export const make = Effect.gen(function* () {
794796
Effect.provideContext(readerContext),
795797
);
796798
// A window no complete scan has read would show partial totals, so every directory must cover it.
799+
// Saved files are keyed by path, so two providers reading one directory keep only one parse.
797800
const fromMemory =
798801
provisional &&
799802
resolved.dirs.length > 0 &&
803+
new Set(resolved.dirs.map((source) => source.dir)).size === resolved.dirs.length &&
800804
resolved.dirs.every(
801805
(source) => (coveredSince.get(coverageKey(source)) ?? Infinity) <= windowStartMs,
802806
);

‎packages/client-runtime/src/state/server.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,12 @@ export function createServerEnvironmentAtoms<R, E>(
15261526
);
15271527
if (Option.isSome(previous)) return read;
15281528
return request(WS_METHODS.serverGetUsageSummary, { ...input, provisional: true }).pipe(
1529-
Effect.filterOrElse(settled, (saved) => emit(saved).pipe(Effect.andThen(read))),
1529+
Effect.matchEffect({
1530+
// The saved answer only speeds things up; without it the plain read still answers.
1531+
onFailure: () => read,
1532+
onSuccess: (saved) =>
1533+
settled(saved) ? Effect.succeed(saved) : emit(saved).pipe(Effect.andThen(read)),
1534+
}),
15301535
);
15311536
},
15321537
}),

‎packages/client-runtime/src/state/serverUsage.test.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,3 +322,22 @@ it.effect("keeps the cached usage summary when the awaited refresh fails", () =>
322322
}),
323323
),
324324
);
325+
326+
it.effect("reads usage in full when the saved answer cannot be read", () =>
327+
Effect.scoped(
328+
Effect.gen(function* () {
329+
const harness = yield* makeHarness((_request, input) =>
330+
input.provisional === true
331+
? Effect.fail(
332+
new UsageReadError({ reason: "scanFailed", detail: "saved scan unreadable" }),
333+
)
334+
: Effect.void,
335+
);
336+
const summary = harness.summary();
337+
const unmount = harness.registry.mount(summary);
338+
yield* settledSummary(harness.registry, summary);
339+
expect(harness.inputs().map(({ provisional }) => provisional)).toEqual([true, undefined]);
340+
unmount();
341+
}),
342+
),
343+
);

0 commit comments

Comments
 (0)