@@ -3076,10 +3076,13 @@ it.effect(
30763076 } ) ,
30773077) ;
30783078
3079- // Models the idle timer's view of two hours of host sleep, five awake minutes after open.
3080- // Libuv's clock keeps counting while Windows and macOS sleep, so the timer fires on resume far past
3081- // its due time; Linux pauses the timer and the monotonic clock while only wall time jumps.
3082- const idleAcrossHostSleep = ( input : { readonly timerCountsSleep : boolean } ) =>
3079+ // Models the idle timer's view of host sleep starting awakeMs after open. Where the timer clock counts
3080+ // sleep, the timer fires on resume far past its due time; where it pauses, only wall time jumps.
3081+ const idleAcrossHostSleep = ( input : {
3082+ readonly timerCountsSleep : boolean ;
3083+ readonly awakeMs : number ;
3084+ readonly sleepMs : number ;
3085+ } ) =>
30833086 Effect . gen ( function * ( ) {
30843087 const state = yield * Ref . make ( emptyState ) ;
30853088 const testClock = yield * TestClock . testClockWith ( Effect . succeed ) ;
@@ -3112,10 +3115,11 @@ const idleAcrossHostSleep = (input: { readonly timerCountsSleep: boolean }) =>
31123115 } ) ;
31133116 yield * manager . open ( { threadId, providerSessionId, modelSelection, runtimePolicy } ) ;
31143117
3115- yield * TestClock . adjust ( "5 minutes" ) ;
3116- // A counting timer spends 25 of the two hours reaching its due time, then fires on resume.
3117- sleptMs = input . timerCountsSleep ? 2 * 60 * 60_000 - 25 * 60_000 : 2 * 60 * 60_000 ;
3118- yield * TestClock . adjust ( "25 minutes" ) ;
3118+ const untilDeadlineMs = 30 * 60_000 - input . awakeMs ;
3119+ yield * TestClock . adjust ( input . awakeMs ) ;
3120+ // A counting timer spends part of the sleep reaching its due time, then fires on resume.
3121+ sleptMs = input . timerCountsSleep ? input . sleepMs - untilDeadlineMs : input . sleepMs ;
3122+ yield * TestClock . adjust ( untilDeadlineMs ) ;
31193123 yield * Effect . yieldNow ;
31203124 const releasedAtFirstDeadline = ! ( yield * manager . isLive ( providerSessionId ) ) ;
31213125 const closeCountAtFirstDeadline = ( yield * Ref . get ( state ) ) . closeCount ;
@@ -3139,22 +3143,32 @@ const idleAcrossHostSleep = (input: { readonly timerCountsSleep: boolean }) =>
31393143// regression: #11805 sessions were released right after the computer woke from sleep
31403144it . effect ( "ProviderSessionManagerV2 does not count host sleep toward the idle timeout" , ( ) =>
31413145 Effect . gen ( function * ( ) {
3142- const result = yield * idleAcrossHostSleep ( { timerCountsSleep : true } ) ;
3143- assert . isFalse (
3144- result . releasedAtFirstDeadline ,
3145- "session was idle-released on resume after only 5 awake minutes of a 30 minute timeout" ,
3146- ) ;
3147- assert . equal ( result . closeCountAtFirstDeadline , 0 ) ;
3148- assert . isTrue ( result . releasedAtSecondDeadline ) ;
3149- assert . equal ( result . closeCountAtSecondDeadline , 1 ) ;
3146+ for ( const { awakeMs, sleepMs } of [
3147+ { awakeMs : 5 * 60_000 , sleepMs : 2 * 60 * 60_000 } ,
3148+ // Overshoots the deadline by under a minute, so deadline lateness alone misses it.
3149+ { awakeMs : 1_000 , sleepMs : 30 * 60_000 + 30_000 } ,
3150+ ] ) {
3151+ const result = yield * idleAcrossHostSleep ( { timerCountsSleep : true , awakeMs, sleepMs } ) ;
3152+ assert . isFalse (
3153+ result . releasedAtFirstDeadline ,
3154+ `session was idle-released on resume after ${ awakeMs } awake ms and ${ sleepMs } ms asleep` ,
3155+ ) ;
3156+ assert . equal ( result . closeCountAtFirstDeadline , 0 ) ;
3157+ assert . isTrue ( result . releasedAtSecondDeadline ) ;
3158+ assert . equal ( result . closeCountAtSecondDeadline , 1 ) ;
3159+ }
31503160 } ) ,
31513161) ;
31523162
31533163it . effect (
31543164 "ProviderSessionManagerV2 releases on time when the idle timer already paused during host sleep" ,
31553165 ( ) =>
31563166 Effect . gen ( function * ( ) {
3157- const result = yield * idleAcrossHostSleep ( { timerCountsSleep : false } ) ;
3167+ const result = yield * idleAcrossHostSleep ( {
3168+ timerCountsSleep : false ,
3169+ awakeMs : 5 * 60_000 ,
3170+ sleepMs : 2 * 60 * 60_000 ,
3171+ } ) ;
31583172 assert . isTrue (
31593173 result . releasedAtFirstDeadline ,
31603174 "session outlived its 30 awake idle minutes because wall time jumped during sleep" ,
0 commit comments