@@ -16,6 +16,7 @@ import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
1616import * as Effect from "effect/Effect" ;
1717import * as Exit from "effect/Exit" ;
1818import * as FileSystem from "effect/FileSystem" ;
19+ import * as Option from "effect/Option" ;
1920import * as Path from "effect/Path" ;
2021import type * as PlatformError from "effect/PlatformError" ;
2122import * as SqlClient from "effect/sql/SqlClient" ;
@@ -93,12 +94,12 @@ export interface OpenCodeUsageReadResult {
9394const isNotFound = ( cause : PlatformError . PlatformError ) => cause . reason . _tag === "NotFound" ;
9495const MESSAGE_PAGE_SIZE = 64 ;
9596
96- /** A regular file or directory, never a symlink to one . */
97- const entryType = Effect . fn ( "entryType " ) ( function * ( path : string ) {
97+ /** Stat of a regular file or directory; a symlink reports as itself and is never followed . */
98+ const entryInfo = Effect . fn ( "entryInfo " ) ( function * ( path : string ) {
9899 const fileSystem = yield * FileSystem . FileSystem ;
99100 const link = yield * Effect . exit ( fileSystem . readLink ( path ) ) ;
100- if ( Exit . isSuccess ( link ) ) return "SymbolicLink" as const ;
101- return ( yield * fileSystem . stat ( path ) ) . type ;
101+ if ( Exit . isSuccess ( link ) ) return { type : "SymbolicLink" as const , mtime : Option . none < Date > ( ) } ;
102+ return yield * fileSystem . stat ( path ) ;
102103} ) ;
103104
104105/** Reads current SQLite and pre-migration JSON stores without modifying either. */
@@ -127,8 +128,8 @@ export const readOpenCodeUsage = Effect.fn("readOpenCodeUsage")(function* (
127128 names . filter ( ( name ) => / ^ o p e n c o d e (?: - [ a - z A - Z 0 - 9 _ - ] + ) ? \. d b $ / . test ( name ) ) ,
128129 // One database removed between listing and stat must not hide the rest.
129130 ( name ) =>
130- entryType ( path . join ( root , name ) ) . pipe (
131- Effect . map ( ( type ) => type === "File" ) ,
131+ entryInfo ( path . join ( root , name ) ) . pipe (
132+ Effect . map ( ( info ) => info . type === "File" ) ,
132133 Effect . catchTags ( {
133134 PlatformError : ( cause ) =>
134135 isNotFound ( cause ) ? Effect . succeed ( false ) : Effect . fail ( cause ) ,
@@ -235,18 +236,21 @@ export const readOpenCodeUsage = Effect.fn("readOpenCodeUsage")(function* (
235236 yield * Effect . gen ( function * ( ) {
236237 for ( const name of yield * fileSystem . readDirectory ( directory ) ) {
237238 const entry = path . join ( directory , name ) ;
238- const type = yield * entryType ( entry ) . pipe (
239+ const info = yield * entryInfo ( entry ) . pipe (
239240 Effect . catchTags ( {
240241 PlatformError : ( cause ) =>
241242 isNotFound ( cause ) ? Effect . succeed ( null ) : Effect . fail ( cause ) ,
242243 } ) ,
243244 ) ;
244- if ( type === "Directory" ) {
245+ if ( info ?. type === "Directory" ) {
245246 directories . push ( entry ) ;
246- } else if ( type === "File" && name . endsWith ( ".json" ) ) {
247+ } else if ( info ?. type === "File" && name . endsWith ( ".json" ) ) {
247248 found = true ;
248249 const id = name . slice ( 0 , - 5 ) ;
249250 if ( seen . has ( `opencode:${ id } ` ) ) continue ;
251+ // A message cannot be created after its file was last written, so a
252+ // file untouched since the window opened holds nothing in range.
253+ if ( Option . exists ( info . mtime , ( mtime ) => mtime . getTime ( ) < sinceMs ) ) continue ;
250254 const file = { path : entry , records : [ ] as UsageRecord [ ] } ;
251255 files . push ( file ) ;
252256 yield * fileSystem . readFileString ( entry ) . pipe (
0 commit comments