@@ -296,6 +296,8 @@ function makeProviderAdapter(
296296 readonly beforeUnload ?: Effect . Effect < void > ;
297297 /** Registers the process's closeCount finalizer before `beforeOpen` runs. */
298298 readonly spawnBeforeOpen ?: boolean ;
299+ /** Completed when a hanging scope close reaches its wedged finalizer. */
300+ readonly scopeCloseReached ?: Deferred . Deferred < void > ;
299301 } = { } ,
300302) : ProviderAdapterV2Shape {
301303 const countClose = Effect . addFinalizer ( ( ) =>
@@ -304,6 +306,15 @@ function makeProviderAdapter(
304306 closeCount : current . closeCount + 1 ,
305307 } ) ) ,
306308 ) ;
309+ // Registered after countClose so it runs first on scope close, wedging the
310+ // close before the closeCount finalizer, like a provider process that never
311+ // yields its message stream.
312+ const hangClose = Effect . addFinalizer ( ( ) =>
313+ ( options . scopeCloseReached === undefined
314+ ? Effect . void
315+ : Deferred . succeed ( options . scopeCloseReached , undefined )
316+ ) . pipe ( Effect . andThen ( Effect . never ) ) ,
317+ ) ;
307318 return {
308319 instanceId : ProviderInstanceId . make ( "codex" ) ,
309320 driver : CODEX_DRIVER ,
@@ -313,6 +324,7 @@ function makeProviderAdapter(
313324 Effect . gen ( function * ( ) {
314325 if ( options . spawnBeforeOpen === true ) {
315326 yield * countClose ;
327+ if ( options . hangSessionScopeClose === true ) yield * hangClose ;
316328 }
317329 if ( options . mcpConfigs !== undefined && options . spawnBeforeOpen === true ) {
318330 yield * Ref . update ( options . mcpConfigs , ( configs ) => [
@@ -347,12 +359,7 @@ function makeProviderAdapter(
347359 } ) ;
348360 if ( options . spawnBeforeOpen !== true ) {
349361 yield * countClose ;
350- }
351- if ( options . hangSessionScopeClose === true ) {
352- // Registered last so it runs first on scope close, wedging the
353- // close before the closeCount finalizer, like a provider process
354- // that never yields its message stream.
355- yield * Effect . addFinalizer ( ( ) => Effect . never ) ;
362+ if ( options . hangSessionScopeClose === true ) yield * hangClose ;
356363 }
357364
358365 return {
@@ -425,6 +432,7 @@ function makeTestLayer(input: {
425432 readonly hangSessionScopeClose ?: boolean ;
426433 readonly beforeUnload ?: Effect . Effect < void > ;
427434 readonly spawnBeforeOpen ?: boolean ;
435+ readonly scopeCloseReached ?: Deferred . Deferred < void > ;
428436 readonly serverSettingsLayer ?: ReturnType < typeof ServerSettings . layerTest > ;
429437 readonly projectServiceLayer ?: Layer . Layer < ProjectService . ProjectService > ;
430438} ) {
@@ -448,6 +456,9 @@ function makeTestLayer(input: {
448456 : { hangSessionScopeClose : input . hangSessionScopeClose } ) ,
449457 ...( input . beforeUnload === undefined ? { } : { beforeUnload : input . beforeUnload } ) ,
450458 ...( input . spawnBeforeOpen === undefined ? { } : { spawnBeforeOpen : input . spawnBeforeOpen } ) ,
459+ ...( input . scopeCloseReached === undefined
460+ ? { }
461+ : { scopeCloseReached : input . scopeCloseReached } ) ,
451462 } ) ,
452463 ) ;
453464 const providerEventIngestorTestLayer = ProviderEventIngestor . layer . pipe (
@@ -989,6 +1000,63 @@ it.effect("ProviderSessionManagerV2 cleans up an open interrupted mid-handshake"
9891000 } ) ,
9901001) ;
9911002
1003+ it . effect ( "ProviderSessionManagerV2 cleans up an interrupted open whose scope close hangs" , ( ) =>
1004+ Effect . gen ( function * ( ) {
1005+ const state = yield * Ref . make ( emptyState ) ;
1006+ const mcpConfigs = yield * Ref . make <
1007+ ReadonlyArray < McpProviderSession . McpProviderSessionConfig | undefined >
1008+ > ( [ ] ) ;
1009+ const handshakeStarted = yield * Deferred . make < void > ( ) ;
1010+ const scopeCloseReached = yield * Deferred . make < void > ( ) ;
1011+ yield * Effect . gen ( function * ( ) {
1012+ const eventSink = yield * EventSink . EventSinkV2 ;
1013+ const idAllocator = yield * IdAllocator . IdAllocatorV2 ;
1014+ const manager = yield * ProviderSessionManager . ProviderSessionManagerV2 ;
1015+ const registry = yield * McpSessionRegistry . McpSessionRegistry ;
1016+ const now = yield * DateTime . now ;
1017+ const threadId = ThreadId . make ( "thread-provider-session-manager-interrupted-hung-open" ) ;
1018+ const providerSessionId = yield * idAllocator . allocate . providerSession ( {
1019+ providerInstanceId : modelSelection . instanceId ,
1020+ threadId,
1021+ } ) ;
1022+ yield * eventSink . write ( {
1023+ events : [ yield * makeThreadCreatedEvent ( { idAllocator, threadId, now } ) ] ,
1024+ } ) ;
1025+
1026+ // Detached so the layer's close does not wait on the wedged scope.
1027+ const opening = yield * manager
1028+ . open ( { threadId, providerSessionId, modelSelection, runtimePolicy } )
1029+ . pipe ( Effect . forkDetach ) ;
1030+ yield * Deferred . await ( handshakeStarted ) ;
1031+ const issued = ( yield * Ref . get ( mcpConfigs ) ) . at ( - 1 ) ;
1032+ const token = issued ?. authorizationHeader . replace ( / ^ B e a r e r \s + / , "" ) ;
1033+ assert . isDefined ( token ) ;
1034+
1035+ // The interrupt starts cleanup; the scope close then never finishes.
1036+ opening . interruptUnsafe ( ) ;
1037+ yield * Deferred . await ( scopeCloseReached ) ;
1038+
1039+ // The session cleanup already ran, ahead of the stuck close.
1040+ assert . isUndefined ( yield * registry . resolve ( token ! ) ) ;
1041+ assert . isUndefined ( McpProviderSession . readMcpProviderSession ( threadId ) ) ;
1042+ assert . equal ( ( yield * Ref . get ( state ) ) . closeCount , 0 ) ;
1043+ } ) . pipe (
1044+ Effect . provide (
1045+ makeTestLayer ( {
1046+ state,
1047+ idleTimeoutMs : 60_000 ,
1048+ mcpConfigs,
1049+ beforeOpen : ( ) =>
1050+ Deferred . succeed ( handshakeStarted , undefined ) . pipe ( Effect . andThen ( Effect . never ) ) ,
1051+ spawnBeforeOpen : true ,
1052+ hangSessionScopeClose : true ,
1053+ scopeCloseReached,
1054+ } ) ,
1055+ ) ,
1056+ ) ;
1057+ } ) ,
1058+ ) ;
1059+
9921060it . effect ( "ProviderSessionManagerV2 stops a session still opening when its layer shuts down" , ( ) =>
9931061 Effect . gen ( function * ( ) {
9941062 const state = yield * Ref . make ( emptyState ) ;
0 commit comments