@@ -10,16 +10,17 @@ import { CLAUDE_SYNTHETIC_MODEL } from "../provider/Drivers/claudeUsage.ts";
1010import { mergeUsageCopies } from "./usageAggregation.ts" ;
1111import { GUARD_LENGTH , type TranscriptParsePosition } from "./usageTranscriptReader.ts" ;
1212
13- const USAGE_SCAN_CACHE_VERSION = 13 as const ;
13+ const USAGE_SCAN_CACHE_VERSION = 14 as const ;
1414const SPEED_COMPATIBLE_SINCE_VERSION = 4 ;
1515
1616/**
1717 * An older server sharing that directory cannot read a newer cache and would
1818 * replace it, dropping saved usage for deleted transcripts. Separate files keep
1919 * the newer one; older files are removed once it is saved.
2020 */
21- export const SCAN_CACHE_FILE_NAME = "usage-scan-cache-v13 .json" ;
21+ export const SCAN_CACHE_FILE_NAME = "usage-scan-cache-v14 .json" ;
2222export const LEGACY_SCAN_CACHE_FILE_NAMES = [
23+ "usage-scan-cache-v13.json" ,
2324 "usage-scan-cache-v12.json" ,
2425 "usage-scan-cache-v11.json" ,
2526 "usage-scan-cache-v10.json" ,
@@ -60,7 +61,8 @@ type SerializedRecord = readonly [
6061 reportedCostUsd : number | null ,
6162 speed : number ,
6263 rateModelIndex ?: number | null ,
63- unresolvedServiceTierTurnId ?: string ,
64+ unresolvedServiceTierTurnId ?: string | null ,
65+ supersedesDedupeKey ?: string ,
6466] ;
6567
6668interface SerializedFile {
@@ -119,9 +121,11 @@ function serializeFile(entry: CachedFile, tables: InternTables): SerializedFile
119121 record . rateModel === undefined
120122 ? null
121123 : intern ( tables . models , tables . modelIndex , record . rateModel ) ,
122- ...( record . unresolvedServiceTierTurnId === undefined
123- ? ( [ ] as const )
124- : ( [ record . unresolvedServiceTierTurnId ] as const ) ) ,
124+ ...( record . supersedesDedupeKey !== undefined
125+ ? ( [ record . unresolvedServiceTierTurnId ?? null , record . supersedesDedupeKey ] as const )
126+ : record . unresolvedServiceTierTurnId === undefined
127+ ? ( [ ] as const )
128+ : ( [ record . unresolvedServiceTierTurnId ] as const ) ) ,
125129 ] ;
126130 return {
127131 s : entry . size ,
@@ -212,6 +216,7 @@ export function decodeScanCache(
212216 speedIndex ,
213217 rateModelIndex ,
214218 unresolvedServiceTierTurnId ,
219+ supersedesDedupeKey ,
215220 ] = row as SerializedRecord ;
216221 const speed = typeof speedIndex === "number" ? SPEEDS [ speedIndex ] : undefined ;
217222
@@ -221,8 +226,8 @@ export function decodeScanCache(
221226 typeof timestampMs !== "number" ||
222227 ! Number . isFinite ( timestampMs ) ||
223228 model === undefined ||
224- ( unresolvedServiceTierTurnId !== undefined &&
225- typeof unresolvedServiceTierTurnId !== "string" ) ||
229+ ( unresolvedServiceTierTurnId != null && typeof unresolvedServiceTierTurnId !== "string" ) ||
230+ ( supersedesDedupeKey !== undefined && typeof supersedesDedupeKey !== "string" ) ||
226231 ( rateModelIndex != null && rateModel === undefined ) ||
227232 ! Number . isFinite ( uncached ) ||
228233 ! Number . isFinite ( cached ) ||
@@ -253,9 +258,10 @@ export function decodeScanCache(
253258 } ,
254259 reportedCostUsd : typeof reportedCostUsd === "number" ? reportedCostUsd : null ,
255260 speed,
256- ...( version >= 7 && unresolvedServiceTierTurnId !== undefined
261+ ...( version >= 7 && unresolvedServiceTierTurnId != null
257262 ? { unresolvedServiceTierTurnId }
258263 : { } ) ,
264+ ...( supersedesDedupeKey === undefined ? { } : { supersedesDedupeKey } ) ,
259265 dedupeKey : typeof dedupeKey === "string" ? dedupeKey : null ,
260266 } ) ;
261267 }
@@ -292,9 +298,9 @@ export function decodeScanCache(
292298 }
293299 // Keep history for deleted rollouts, but re-parse incompatible reducer state.
294300 // v9 and v11 repair skipped Codex requests; clean v8+ entries stay served while unchanged.
295- // Claude history before v13 lacks per-attempt fallback usage .
301+ // Claude history before v14 lacks authoritative fallback replacement keys .
296302 const legacy =
297- ( entry . p === "claude" && version < 13 ) ||
303+ ( entry . p === "claude" && version < 14 ) ||
298304 ( format . state !== undefined &&
299305 ( version < 6 ||
300306 ( entry . p === "codex" && ( version < 8 || ( version < 11 && malformedRecords > 0 ) ) ) ) ) ;
0 commit comments