@@ -249,6 +249,7 @@ const layerService = (input: {
249249 ) ;
250250
251251const BEFORE_NARROW_WINDOW = Date . parse ( "2026-08-01T10:00:00Z" ) / 1000 ;
252+ const NARROW_WINDOW_MTIME = Date . parse ( "2026-09-01T10:00:00Z" ) / 1000 ;
252253const NARROW_WINDOW : UsageSummaryInput = {
253254 timeZone : "UTC" ,
254255 sinceDay : UsageDay . make ( "2026-09-01" ) ,
@@ -2449,6 +2450,75 @@ describe("UsageService", () => {
24492450 } ) . pipe ( Effect . scoped ) ,
24502451 ) ;
24512452
2453+ it . live (
2454+ "answers a provisional read from the last scan, then the exact read adds what changed" ,
2455+ ( ) =>
2456+ Effect . gen ( function * ( ) {
2457+ const { transcript, settings, home } = yield * setup ;
2458+ yield * Effect . promise ( ( ) => NodeFSP . writeFile ( transcript , claudeLine ( 1 , 5 ) ) ) ;
2459+ const provisional = { ...WINDOW , provisional : true } ;
2460+ const claude = ( summary : UsageSummary ) =>
2461+ summary . sources . find ( ( source ) => source . fingerprint . provider === "claude" ) ;
2462+ yield * Effect . gen ( function * ( ) {
2463+ // With nothing persisted, the first answer is a full scan.
2464+ const service = yield * UsageService . make ;
2465+ const loop = NodePath . join ( NodePath . dirname ( transcript ) , "loop.jsonl" ) ;
2466+ yield * Effect . promise ( ( ) => NodeFSP . symlink ( loop , loop , "junction" ) ) ;
2467+ assert . strictEqual ( claude ( yield * service . readSummary ( provisional ) ) ?. status , "partial" ) ;
2468+ yield * Effect . promise ( ( ) => NodeFSP . rm ( loop ) ) ;
2469+ // A scan that missed a path covers nothing, so this is a full scan too.
2470+ assert . isUndefined ( claude ( yield * service . readSummary ( provisional ) ) ?. refreshing ) ;
2471+ yield * service . awaitPersisted ;
2472+
2473+ yield * Effect . promise ( ( ) => NodeFSP . appendFile ( transcript , claudeLine ( 2 , 7 ) ) ) ;
2474+ const restarted = yield * UsageService . make ;
2475+ const saved = yield * restarted . readSummary ( provisional ) ;
2476+ assert . strictEqual ( totalOutputTokens ( saved ) , 5 ) ;
2477+ assert . isTrue ( claude ( saved ) ?. refreshing ) ;
2478+ // A window that starts before the saved scan could only show part of its usage.
2479+ const wider = yield * restarted . readSummary ( {
2480+ ...provisional ,
2481+ sinceDay : UsageDay . make ( "2026-07-01" ) ,
2482+ } ) ;
2483+ assert . strictEqual ( totalOutputTokens ( wider ) , 12 ) ;
2484+ assert . isUndefined ( claude ( wider ) ?. refreshing ) ;
2485+ const refreshed = yield * restarted . readSummary ( { ...WINDOW , awaitRefresh : true } ) ;
2486+ assert . strictEqual ( totalOutputTokens ( refreshed ) , 12 ) ;
2487+ assert . isUndefined ( claude ( refreshed ) ?. refreshing ) ;
2488+ // Saved usage with nothing to show marks nothing refreshing, so it must not be the answer.
2489+ yield * Effect . promise ( ( ) =>
2490+ NodeFSP . appendFile ( transcript , claudeLine ( 3 , 11 , "claude-other" ) ) ,
2491+ ) ;
2492+ const unseen = yield * restarted . readSummary ( {
2493+ ...provisional ,
2494+ modelFilter : { include : [ { model : "claude-other" } ] } ,
2495+ } ) ;
2496+ assert . strictEqual ( totalOutputTokens ( unseen ) , 11 ) ;
2497+ 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 ) ;
2515+ } ) . pipe (
2516+ Effect . scoped ,
2517+ Effect . provide ( layerService ( { prefix : "usage-service-provisional" , home, settings } ) ) ,
2518+ ) ;
2519+ } ) . pipe ( Effect . scoped ) ,
2520+ ) ;
2521+
24522522 it . live ( "filters original model IDs before aliases, pricing, buckets and session counts" , ( ) =>
24532523 Effect . gen ( function * ( ) {
24542524 const { transcript, settings, home } = yield * setup ;
@@ -3204,6 +3274,64 @@ describe("UsageService", () => {
32043274 } ) . pipe ( Effect . scoped ) ,
32053275 ) ;
32063276
3277+ it . live ( "credits the same copy of a duplicate from the last scan as an exact read does" , ( ) =>
3278+ Effect . gen ( function * ( ) {
3279+ yield * TestClock . setTime ( Date . parse ( "2026-08-15T00:00:00Z" ) ) ;
3280+ const { transcript, settings, home } = yield * setup ;
3281+ const dir = NodePath . dirname ( transcript ) ;
3282+ const [ first = "" , second = "" ] = yield * Effect . promise ( async ( ) => {
3283+ await NodeFSP . writeFile ( NodePath . join ( dir , "a.jsonl" ) , "" ) ;
3284+ await NodeFSP . writeFile ( NodePath . join ( dir , "b.jsonl" ) , "" ) ;
3285+ return ( await NodeFSP . readdir ( dir ) ) . map ( ( name ) => NodePath . join ( dir , name ) ) ;
3286+ } ) ;
3287+ const forked = ( line : string ) => line . replace ( '"session-1"' , '"session-2"' ) ;
3288+ yield * Effect . promise ( async ( ) => {
3289+ await NodeFSP . writeFile ( first , claudeLine ( 1 , 5 ) ) ;
3290+ await NodeFSP . utimes ( first , BEFORE_NARROW_WINDOW , BEFORE_NARROW_WINDOW ) ;
3291+ await NodeFSP . writeFile ( second , forked ( claudeLine ( 1 , 5 ) ) + forked ( claudeLine ( 2 , 7 ) ) ) ;
3292+ } ) ;
3293+ yield * Effect . gen ( function * ( ) {
3294+ const service = yield * UsageService . make ;
3295+ // The narrow window saves the second copy before the wide one reads the first.
3296+ yield * service . readSummary ( NARROW_WINDOW ) ;
3297+ const exact = yield * service . readSummary ( WINDOW ) ;
3298+ yield * service . awaitPersisted ;
3299+ const restarted = yield * UsageService . make ;
3300+ const saved = yield * restarted . readSummary ( { ...WINDOW , provisional : true } ) ;
3301+ assert . isTrue ( saved . sources . some ( ( source ) => source . refreshing === true ) ) ;
3302+ assert . deepStrictEqual ( saved . buckets , exact . buckets ) ;
3303+ } ) . pipe (
3304+ Effect . provide ( layerService ( { prefix : "usage-service-saved-order-test" , home, settings } ) ) ,
3305+ ) ;
3306+
3307+ // A narrow scan that first saves the earlier copy still puts it before a later file it skipped.
3308+ yield * Effect . promise ( async ( ) => {
3309+ await NodeFSP . writeFile ( first , forked ( claudeLine ( 1 , 5 ) ) + forked ( claudeLine ( 2 , 7 ) ) ) ;
3310+ await NodeFSP . utimes (
3311+ first ,
3312+ Date . parse ( "2026-07-01T00:00:00Z" ) / 1000 ,
3313+ Date . parse ( "2026-07-01T00:00:00Z" ) / 1000 ,
3314+ ) ;
3315+ await NodeFSP . writeFile ( second , claudeLine ( 1 , 5 ) ) ;
3316+ await NodeFSP . utimes ( second , BEFORE_NARROW_WINDOW , BEFORE_NARROW_WINDOW ) ;
3317+ } ) ;
3318+ yield * Effect . gen ( function * ( ) {
3319+ const service = yield * UsageService . make ;
3320+ yield * service . readSummary ( WINDOW ) ;
3321+ yield * Effect . promise ( ( ) =>
3322+ NodeFSP . utimes ( first , NARROW_WINDOW_MTIME , NARROW_WINDOW_MTIME ) ,
3323+ ) ;
3324+ yield * service . readSummary ( NARROW_WINDOW ) ;
3325+ const saved = yield * service . readSummary ( { ...WINDOW , provisional : true } ) ;
3326+ assert . isTrue ( saved . sources . some ( ( source ) => source . refreshing === true ) ) ;
3327+ const exact = yield * service . readSummary ( WINDOW ) ;
3328+ assert . deepStrictEqual ( saved . buckets , exact . buckets ) ;
3329+ } ) . pipe (
3330+ Effect . provide ( layerService ( { prefix : "usage-service-narrow-order-test" , home, settings } ) ) ,
3331+ ) ;
3332+ } ) . pipe ( Effect . scoped , Effect . provide ( TestClock . layer ( ) ) ) ,
3333+ ) ;
3334+
32073335 it . live . skipIf ( HostProcess . Platform . defaultValue ( ) === "win32" ) (
32083336 "keeps a newer cached read when a slower scan of another window finishes later" ,
32093337 ( ) =>
@@ -3345,7 +3473,14 @@ describe("UsageService", () => {
33453473 HttpClient . HttpClient ,
33463474 HttpClient . make ( ( request ) =>
33473475 Deferred . await ( releaseRates ) . pipe (
3348- Effect . as ( HttpClientResponse . fromWeb ( request , Response . json ( { } ) ) ) ,
3476+ Effect . as (
3477+ HttpClientResponse . fromWeb (
3478+ request ,
3479+ Response . json ( {
3480+ "example-model" : { input_cost_per_token : 1e-6 , output_cost_per_token : 1e-5 } ,
3481+ } ) ,
3482+ ) ,
3483+ ) ,
33493484 ) ,
33503485 ) ,
33513486 ) ,
@@ -3364,7 +3499,8 @@ describe("UsageService", () => {
33643499
33653500 const original = yield * Fiber . join ( first ) ;
33663501 const updated = yield * Fiber . join ( second ) ;
3367- assert . strictEqual ( original . buckets [ 0 ] ?. costUsd , 0 ) ;
3502+ // Fetched rates price the first read, so scans must start while the fetch is pending.
3503+ assert . isAbove ( original . buckets [ 0 ] ?. costUsd ?? 0 , 0 ) ;
33683504 assert . closeTo ( updated . buckets [ 0 ] ?. costUsd ?? - 1 , 0.00006 , 1e-12 ) ;
33693505 } ) . pipe (
33703506 Effect . provide ( layerService ( { prefix : "usage-service-price-race-test" , home, settings } ) ) ,
0 commit comments