Skip to content

Commit 3482136

Browse files
fix(usage): recover grouped source identity from legacy roots
1 parent d9acff8 commit 3482136

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,19 @@ export const make = Effect.gen(function* () {
350350
for (const { dir: directory, transcriptDirs, fileName } of directories.flat()) {
351351
const sourceKey = provider + "\0" + directory;
352352
const previous = sourceCache.get(sourceKey);
353-
const dir = yield* fileSystem
354-
.realPath(directory)
355-
.pipe(Effect.orElseSucceed(() => previous?.dir ?? directory));
353+
const dir = yield* fileSystem.realPath(directory).pipe(
354+
Effect.orElseSucceed(() => {
355+
if (previous !== undefined) return previous.dir;
356+
// Older caches identified a source by its transcript root, before roots were grouped.
357+
for (const root of transcriptDirs ?? []) {
358+
const cached = sourceCache.get(provider + "\0" + root);
359+
if (cached !== undefined && isWithinDirectory(root, directory)) {
360+
return path.resolve(cached.dir, path.relative(root, directory));
361+
}
362+
}
363+
return directory;
364+
}),
365+
);
356366
const resolvedRoots = Object.fromEntries(
357367
yield* Effect.forEach(
358368
transcriptDirs ?? [directory],

0 commit comments

Comments
 (0)