@@ -268,36 +268,17 @@ export const make = Effect.gen(function* () {
268268 const directoryEntries = yield * fileSystem
269269 . readDirectory ( dataDirectory )
270270 . pipe ( Effect . catchCause ( ( ) => Effect . succeed ( [ ] as const ) ) ) ;
271- const databasePaths = resolveOpenCodeDatabasePaths ( {
271+ return resolveOpenCodeDatabasePaths ( {
272272 dataDirectory,
273273 databaseOverride : environment [ "OPENCODE_DB" ] ,
274274 disableChannelDatabase : environment [ "OPENCODE_DISABLE_CHANNEL_DB" ] ,
275275 directoryEntries,
276276 path,
277277 } ) ;
278- const hasOverride = ( environment [ "OPENCODE_DB" ] ?. trim ( ) . length ?? 0 ) > 0 ;
279- return {
280- databasePaths,
281- sourcePath :
282- hasOverride && databasePaths . length === 1
283- ? ( databasePaths [ 0 ] ?? dataDirectory )
284- : dataDirectory ,
285- } ;
286278 } ) ,
287279 ) ;
288280
289- const databasePaths = [ ...new Set ( resolved . flatMap ( ( entry ) => entry . databasePaths ) ) ] . sort (
290- ( left , right ) => left . localeCompare ( right ) ,
291- ) ;
292- const sourcePaths = [ ...new Set ( resolved . map ( ( entry ) => entry . sourcePath ) ) ] . sort (
293- ( left , right ) => left . localeCompare ( right ) ,
294- ) ;
295- return {
296- databasePaths,
297- // Usage buckets are provider-scoped, so all instance databases must be
298- // represented by one deterministic source fingerprint.
299- sourcePath : sourcePaths . join ( ", " ) ,
300- } ;
281+ return [ ...new Set ( resolved . flat ( ) ) ] . sort ( ( left , right ) => left . localeCompare ( right ) ) ;
301282 } ) ;
302283
303284 /**
@@ -408,7 +389,9 @@ export const make = Effect.gen(function* () {
408389 Effect . provideService ( Path . Path , path ) ,
409390 ) ;
410391 const dirs = resolvedSources . dirs ;
411- const openCode = yield * resolveOpenCodeDatabases ( resolvedSources . openCodeEnvironments ) ;
392+ const openCodeDatabasePaths = yield * resolveOpenCodeDatabases (
393+ resolvedSources . openCodeEnvironments ,
394+ ) ;
412395 const windowStart = DateTime . make ( `${ input . sinceDay } T00:00:00Z` ) ;
413396 if ( Option . isNone ( windowStart ) ) {
414397 return yield * new UsageReadError ( {
@@ -489,62 +472,47 @@ export const make = Effect.gen(function* () {
489472 } ) ;
490473 }
491474
492- if ( openCode . databasePaths . length > 0 ) {
493- const volumeIds = yield * Effect . forEach ( openCode . databasePaths , ( databasePath ) =>
494- Effect . promise ( ( ) => readDirectoryVolumeId ( databasePath ) ) ,
495- ) ;
496- const volumeId = [ ...new Set ( volumeIds . filter ( ( id ) => id . length > 0 ) ) ]
497- . sort ( ( left , right ) => left . localeCompare ( right ) )
498- . join ( "|" ) ;
475+ for ( const databasePath of openCodeDatabasePaths ) {
476+ const volumeId = yield * Effect . promise ( ( ) => readDirectoryVolumeId ( databasePath ) ) ;
499477 const sessionIds = new Set < string > ( ) ;
500- let existingDatabases = 0 ;
501- let scannedFiles = 0 ;
502- let skippedFiles = 0 ;
503- let malformedRecords = 0 ;
504-
505- for ( const databasePath of openCode . databasePaths ) {
506- const exists = yield * fileSystem
507- . exists ( databasePath )
508- . pipe ( Effect . catchCause ( ( ) => Effect . succeed ( false ) ) ) ;
509- if ( ! exists ) continue ;
510- existingDatabases += 1 ;
511-
512- const result = yield * Effect . promise ( ( ) => readOpenCodeUsage ( databasePath , windowStartMs ) ) ;
513- if ( result === null ) {
514- skippedFiles += 1 ;
515- continue ;
516- }
478+ const exists = yield * fileSystem
479+ . exists ( databasePath )
480+ . pipe ( Effect . catchCause ( ( ) => Effect . succeed ( false ) ) ) ;
481+ const result = exists
482+ ? yield * Effect . promise ( ( ) => readOpenCodeUsage ( databasePath , windowStartMs ) )
483+ : null ;
484+ const failed = exists && result === null ;
485+ const malformedRecords = result ?. malformedRecords ?? 0 ;
517486
518- scannedFiles += 1 ;
519- malformedRecords += result . malformedRecords ;
487+ if ( result !== null ) {
520488 for ( const record of result . records ) {
521- if ( aggregator . add ( record ) && record . sessionId . length > 0 ) {
489+ if (
490+ aggregator . add ( { ...record , sourcePath : databasePath } ) &&
491+ record . sessionId . length > 0
492+ ) {
522493 sessionIds . add ( record . sessionId ) ;
523494 }
524495 }
525496 }
526497
527- const missing = existingDatabases === 0 ;
528- const failed = existingDatabases > 0 && scannedFiles === 0 ;
529- const partial = ! missing && ! failed && ( skippedFiles > 0 || malformedRecords > 0 ) ;
530498 sources . push ( {
531499 fingerprint : {
532500 hostId,
533501 provider : "opencode" ,
534- resolvedHomePath : openCode . sourcePath ,
502+ resolvedHomePath : databasePath ,
535503 volumeId,
536504 } ,
537- status : missing ? "missing" : failed ? "failed" : partial ? "partial" : "ok" ,
538- scannedFiles,
539- skippedFiles,
505+ status : ! exists ? "missing" : failed ? "failed" : malformedRecords > 0 ? "partial" : "ok" ,
506+ scannedFiles : result === null ? 0 : 1 ,
507+ skippedFiles : failed ? 1 : 0 ,
540508 malformedRecords,
541509 distinctSessions : sessionIds . size ,
542- message : missing
510+ message : ! exists
543511 ? "No usage database on this environment."
544512 : failed
545513 ? "The usage database could not be read."
546- : partial
547- ? "Some OpenCode usage databases or rows were skipped."
514+ : malformedRecords > 0
515+ ? "Some OpenCode usage rows were skipped."
548516 : null ,
549517 } ) ;
550518 }
0 commit comments