@@ -63,7 +63,6 @@ import type {
6363 TranscriptUsageFormat ,
6464 UsageRecord ,
6565} from "@t3tools/provider-core/server/usage" ;
66- import { readOpenCodeUsage } from "./opencodeUsageReader.ts" ;
6766import { makeAntigravityUsageCache , readAntigravityUsage } from "./antigravityUsageReader.ts" ;
6867import {
6968 CURSOR_ACCOUNT_CACHE_FILE_NAME ,
@@ -127,6 +126,11 @@ const transcriptReaders = BUILT_IN_USAGE_DRIVERS.flatMap((driver) =>
127126 driver . usage ?. kind === "transcripts" ? [ { driver, reader : driver . usage } ] : [ ] ,
128127) ;
129128
129+ /** The scan readers, in driver order. */
130+ const scanReaders = BUILT_IN_USAGE_DRIVERS . flatMap ( ( driver ) =>
131+ driver . usage ?. kind === "scan" ? [ { driver, reader : driver . usage } ] : [ ] ,
132+ ) ;
133+
130134/** Transcript formats by provider, for decoding the persisted scan cache. */
131135const transcriptFormats = new Map (
132136 transcriptReaders . map ( ( { reader } ) => [ reader . provider , reader . format ] as const ) ,
@@ -851,32 +855,36 @@ export const make = Effect.gen(function* () {
851855 }
852856 return [ ...canonical ] ;
853857 } ) ;
854- const dataHome = hostEnvironment [ "XDG_DATA_HOME" ] ?. trim ( ) ;
855858
856- const openCode = Effect . gen ( function * ( ) {
857- const roots = yield * envRoots ( "OPENCODE_DATA_DIR" , [
858- path . join (
859- dataHome && path . isAbsolute ( dataHome ) ? dataHome : path . join ( home , ".local" , "share" ) ,
860- "opencode" ,
861- ) ,
862- ] ) ;
863- return yield * Effect . forEach (
864- roots ,
865- ( dir ) =>
866- Effect . gen ( function * ( ) {
867- const result = yield * Effect . promise ( ( ) => readOpenCodeUsage ( dir , windowStartMs ) ) ;
868- return {
869- provider : "opencode" ,
870- dir,
871- volumeId : yield * Effect . promise ( ( ) => readDirectoryVolumeId ( dir ) ) ,
872- files : result . missing && ! result . error ? null : result . files ,
873- status : result . error ? "partial" : "ok" ,
874- ...( result . error ? { message : "Some OpenCode history could not be read." } : { } ) ,
875- } satisfies ScannedDir ;
876- } ) ,
877- { concurrency : "unbounded" } ,
878- ) ;
879- } ) ;
859+ const scans = Effect . forEach (
860+ scanReaders ,
861+ ( { driver, reader } ) =>
862+ reader
863+ . scan ( {
864+ instances : usageInstances ( driver , settings ) ,
865+ windowStartMs,
866+ retentionCutoffMs,
867+ awaitRefresh,
868+ } )
869+ . pipe (
870+ Effect . flatMap ( ( sources ) =>
871+ Effect . forEach ( sources , ( { volumeId, ...source } ) =>
872+ Effect . map (
873+ volumeId === undefined
874+ ? Effect . promise ( ( ) => readDirectoryVolumeId ( source . dir ) )
875+ : Effect . succeed ( volumeId ) ,
876+ ( resolved ) : ScannedDir => ( {
877+ ...source ,
878+ provider : reader . provider ,
879+ volumeId : resolved ,
880+ } ) ,
881+ ) ,
882+ ) ,
883+ ) ,
884+ Effect . provideContext ( readerContext ) ,
885+ ) ,
886+ { concurrency : "unbounded" } ,
887+ ) . pipe ( Effect . map ( ( sources ) => sources . flat ( ) ) ) ;
880888
881889 const antigravity = Effect . gen ( function * ( ) {
882890 const antigravityRoots = yield * envRoots ( "ANTIGRAVITY_DATA_DIR" , [
@@ -999,18 +1007,18 @@ export const make = Effect.gen(function* () {
9991007 // Independent sources scan together. Transcript directories go one at a
10001008 // time, so open files stay at `TRANSCRIPT_READ_CONCURRENCY`. The result
10011009 // keeps this order, since aggregation keeps the first copy of a duplicate.
1002- const [ transcripts , openCodeDirs , antigravityDirs , cursorDirs ] = yield * Effect . all (
1010+ const [ transcripts , scanDirs , antigravityDirs , cursorDirs ] = yield * Effect . all (
10031011 [
10041012 Effect . forEach ( dirs , ( dir ) => scanTranscriptDir ( dir , windowStartMs ) ) ,
1005- openCode ,
1013+ scans ,
10061014 antigravity ,
10071015 cursor ,
10081016 ] ,
10091017 { concurrency : "unbounded" } ,
10101018 ) ;
10111019 const scanned : readonly ScannedDir [ ] = [
10121020 ...transcripts ,
1013- ...openCodeDirs ,
1021+ ...scanDirs ,
10141022 ...antigravityDirs ,
10151023 ...cursorDirs ,
10161024 ] ;
0 commit comments