@@ -782,52 +782,71 @@ describe("orphan worktree reports", () => {
782782 ) ,
783783 ) ;
784784
785- it . effect ( "retries budget-cut orphan sizes and reuses completed measurements" , ( ) =>
786- runCleanupTest (
787- Effect . gen ( function * ( ) {
788- yield * TestClock . setTime ( NOW_MS ) ;
789- const fs = yield * FileSystem . FileSystem ;
790- const measuring = yield * Deferred . make < void > ( ) ;
791- let orphan = "" ;
792- let walks = 0 ;
793- const fixture = yield * cleanupFixture ( ) . pipe (
794- Effect . provideService ( FileSystem . FileSystem , {
795- ...fs ,
796- readDirectory : ( directory , options ) =>
797- Effect . gen ( function * ( ) {
798- if ( directory . endsWith ( "/repository" ) && walks === 0 )
799- yield * TestClock . adjust ( "1 second" ) ;
800- if ( directory === orphan ) {
801- walks ++ ;
802- if ( walks === 1 ) {
803- yield * Deferred . succeed ( measuring , undefined ) ;
804- return yield * Effect . never ;
785+ it . effect . each ( [ "walk-timeout" , "sweep-budget" ] as const ) (
786+ "caches walk timeouts and retries budget-cut orphan sizes (%s)" ,
787+ ( limit ) =>
788+ runCleanupTest (
789+ Effect . gen ( function * ( ) {
790+ yield * TestClock . setTime ( NOW_MS ) ;
791+ const fs = yield * FileSystem . FileSystem ;
792+ const measuring = yield * Deferred . make < void > ( ) ;
793+ let orphan = "" ;
794+ let walks = 0 ;
795+ const fixture = yield * cleanupFixture ( ) . pipe (
796+ Effect . provideService ( FileSystem . FileSystem , {
797+ ...fs ,
798+ readDirectory : ( directory , options ) =>
799+ Effect . gen ( function * ( ) {
800+ if ( directory . endsWith ( "/repository" ) && walks === 0 )
801+ yield * TestClock . adjust ( "1 second" ) ;
802+ if ( directory === orphan ) {
803+ walks ++ ;
804+ if ( limit === "walk-timeout" || walks === 1 ) {
805+ yield * Deferred . succeed ( measuring , undefined ) ;
806+ return yield * Effect . never ;
807+ }
805808 }
806- }
807- return yield * fs . readDirectory ( directory , options ) ;
808- } ) ,
809- } ) ,
810- ) ;
811- fixture . setThreads ( [ ] ) ;
812- orphan = `${ fixture . config . worktreesDir } /repository/orphan` ;
813- yield * fs . makeDirectory ( orphan , { recursive : true } ) ;
814- yield * fs . writeFileString ( `${ orphan } /file` , "x" ) ;
815- yield * fs . utimes ( orphan , 1 , 1 ) ;
816- const sweep = yield * fixture . service . runNow . pipe ( Effect . forkChild ) ;
817- yield * Deferred . await ( measuring ) ;
818- yield * TestClock . adjust ( "29 seconds" ) ;
819- expect ( ( yield * Fiber . join ( sweep ) ) . entries [ 0 ] ?. bytes ) . toBeNull ( ) ;
820- expect ( ( yield * fixture . service . runNow ) . entries [ 0 ] ?. bytes ) . toBe ( 1 ) ;
821- yield * fs . writeFileString ( `${ orphan } /file` , "changed" ) ;
822- expect ( ( yield * fixture . service . runNow ) . entries [ 0 ] ?. bytes ) . toBe ( 1 ) ;
823- expect ( walks ) . toBe ( 2 ) ;
824- fixture . setStoredWorktreePaths ( [ orphan ] ) ;
825- expect ( ( yield * fixture . service . runNow ) . entries ) . toEqual ( [ ] ) ;
826- fixture . setStoredWorktreePaths ( [ ] ) ;
827- expect ( ( yield * fixture . service . runNow ) . entries [ 0 ] ?. bytes ) . toBe ( 7 ) ;
828- expect ( walks ) . toBe ( 3 ) ;
829- } ) ,
830- ) ,
809+ return ( yield * fs . readDirectory ( directory , options ) ) . sort ( ) ;
810+ } ) ,
811+ } ) ,
812+ ) ;
813+ fixture . setThreads ( [ ] ) ;
814+ orphan = `${ fixture . config . worktreesDir } /repository/orphan` ;
815+ yield * fs . makeDirectory ( orphan , { recursive : true } ) ;
816+ yield * fs . writeFileString ( `${ orphan } /file` , "x" ) ;
817+ yield * fs . utimes ( orphan , 1 , 1 ) ;
818+ const later = `${ fixture . config . worktreesDir } /repository/z-later` ;
819+ yield * fs . makeDirectory ( later ) ;
820+ yield * fs . utimes ( later , 1 , 1 ) ;
821+ if ( limit === "sweep-budget" ) {
822+ const first = `${ fixture . config . worktreesDir } /repository/a-first` ;
823+ yield * fs . makeDirectory ( first ) ;
824+ yield * fs . utimes ( first , 1 , 1 ) ;
825+ }
826+ const orphanEntry = ( report : StorageCleanupReport ) =>
827+ report . entries . find ( ( entry ) => entry . path === orphan ) ;
828+ const sweep = yield * fixture . service . runNow . pipe ( Effect . forkChild ) ;
829+ yield * Deferred . await ( measuring ) ;
830+ yield * TestClock . adjust ( limit === "walk-timeout" ? "30 seconds" : "29 seconds" ) ;
831+ const firstReport = yield * Fiber . join ( sweep ) ;
832+ expect ( orphanEntry ( firstReport ) ?. bytes ) . toBeNull ( ) ;
833+ expect ( firstReport . entries . find ( ( entry ) => entry . path === later ) ?. bytes ) . toBeNull ( ) ;
834+ const nextReport = yield * fixture . service . runNow ;
835+ expect ( orphanEntry ( nextReport ) ?. bytes ) . toBe ( limit === "walk-timeout" ? null : 1 ) ;
836+ expect ( nextReport . entries . find ( ( entry ) => entry . path === later ) ?. bytes ) . toBe ( 0 ) ;
837+ yield * fs . writeFileString ( `${ orphan } /file` , "changed" ) ;
838+ expect ( orphanEntry ( yield * fixture . service . runNow ) ?. bytes ) . toBe (
839+ limit === "walk-timeout" ? null : 1 ,
840+ ) ;
841+ expect ( walks ) . toBe ( limit === "walk-timeout" ? 1 : 2 ) ;
842+ if ( limit === "walk-timeout" ) return ;
843+ fixture . setStoredWorktreePaths ( [ orphan ] ) ;
844+ expect ( orphanEntry ( yield * fixture . service . runNow ) ) . toBeUndefined ( ) ;
845+ fixture . setStoredWorktreePaths ( [ ] ) ;
846+ expect ( orphanEntry ( yield * fixture . service . runNow ) ?. bytes ) . toBe ( 7 ) ;
847+ expect ( walks ) . toBe ( 3 ) ;
848+ } ) ,
849+ ) ,
831850 ) ;
832851
833852 it . live . each ( [ "nested" , "direct" ] as const ) (
0 commit comments