@@ -223,9 +223,7 @@ interface LiveSessionEntry {
223223 readonly supportsMultipleProviderThreads : boolean ;
224224 readonly runtime : ProviderAdapter . ProviderAdapterV2SessionRuntime ;
225225 readonly exposedRuntime : ProviderAdapter . ProviderAdapterV2SessionRuntime ;
226- readonly eventSubscribers : Ref . Ref <
227- ReadonlyMap < number , Queue . Queue < ProviderSessionEventSignal , Cause . Done > >
228- > ;
226+ readonly eventSubscribers : Ref . Ref < ProviderSessionSubscribers > ;
229227 readonly closeObservers : Ref . Ref < ReadonlySet < Effect . Effect < void > > | null > ;
230228 readonly requestEventPermit : Semaphore . Semaphore ;
231229 readonly scope : Scope . Closeable ;
@@ -249,6 +247,16 @@ type ProviderSessionEventSignal =
249247 readonly cause : Cause . Cause < ProviderAdapter . ProviderAdapterV2Error > ;
250248 } ;
251249
250+ type ProviderSessionEventTermination =
251+ | { readonly type : "end" }
252+ | { readonly type : "interrupt" }
253+ | Extract < ProviderSessionEventSignal , { readonly type : "failure" } > ;
254+
255+ interface ProviderSessionSubscribers {
256+ readonly queues : ReadonlyMap < number , Queue . Queue < ProviderSessionEventSignal , Cause . Done > > ;
257+ readonly terminal : ProviderSessionEventTermination | null ;
258+ }
259+
252260export interface ProviderSessionManagerV2LayerOptions {
253261 readonly idleTimeoutMs ?: number ;
254262 readonly maxIdlePinMs ?: number ;
@@ -519,64 +527,52 @@ export const layerWithOptions = (
519527 ) ;
520528
521529 const publishToSubscribers = (
522- subscribers : Ref . Ref <
523- ReadonlyMap < number , Queue . Queue < ProviderSessionEventSignal , Cause . Done > >
524- > ,
530+ subscribers : LiveSessionEntry [ "eventSubscribers" ] ,
525531 signal : ProviderSessionEventSignal ,
526532 ) =>
527533 Ref . get ( subscribers ) . pipe (
528534 Effect . flatMap ( ( current ) =>
529- Effect . forEach ( current . values ( ) , ( queue ) => Queue . offer ( queue , signal ) , {
535+ Effect . forEach ( current . queues . values ( ) , ( queue ) => Queue . offer ( queue , signal ) , {
530536 discard : true ,
531537 } ) ,
532538 ) ,
533539 ) ;
534540
535- const failSubscribers = Effect . fn ( "ProviderSessionManager.failSubscribers" ) ( function * (
536- entry : LiveSessionEntry ,
537- detail : string ,
538- ) {
539- const error = new ProviderAdapter . ProviderAdapterEventStreamError ( {
540- driver : entry . runtime . driver ,
541- providerSessionId : entry . runtime . providerSessionId ,
542- cause : detail ,
543- } ) ;
544- const subscribers = yield * Ref . getAndSet ( entry . eventSubscribers , new Map ( ) ) ;
545- yield * Effect . forEach (
546- subscribers . values ( ) ,
547- ( queue ) =>
548- Queue . offer ( queue , {
549- type : "failure" ,
550- cause : Cause . fail ( error ) ,
551- } ) ,
552- { discard : true } ,
553- ) ;
554- } ) ;
541+ const terminateQueue = (
542+ queue : Queue . Queue < ProviderSessionEventSignal , Cause . Done > ,
543+ terminal : ProviderSessionEventTermination ,
544+ ) =>
545+ terminal . type === "interrupt"
546+ ? Queue . clear ( queue ) . pipe ( Effect . andThen ( Queue . interrupt ( queue ) ) , Effect . asVoid )
547+ : ( terminal . type === "failure" ? Queue . offer ( queue , terminal ) : Effect . void ) . pipe (
548+ Effect . andThen ( Queue . end ( queue ) ) ,
549+ Effect . asVoid ,
550+ ) ;
555551
556- // Server shutdown interrupts subscribers rather than ending them: a
557- // cleanly ended stream without a terminal fails its run, while an
558- // interrupted one leaves run settlement to restart recovery.
559- const interruptSubscribers = Effect . fn ( "ProviderSessionManager.interruptSubscribers" ) (
560- function * ( entry : LiveSessionEntry ) {
561- const subscribers = yield * Ref . getAndSet ( entry . eventSubscribers , new Map ( ) ) ;
562- yield * Effect . forEach (
563- subscribers . values ( ) ,
564- ( queue ) => Queue . clear ( queue ) . pipe ( Effect . andThen ( Queue . interrupt ( queue ) ) ) ,
565- { discard : true } ,
552+ const terminateSubscribers = Effect . fn ( "ProviderSessionManager.terminateSubscribers" ) (
553+ function * ( entry : LiveSessionEntry , terminal : ProviderSessionEventTermination ) {
554+ const queues = yield * Ref . modify ( entry . eventSubscribers , ( current ) =>
555+ current . terminal === null
556+ ? [ current . queues , { queues : new Map ( ) , terminal } ]
557+ : [ current . queues , current ] ,
566558 ) ;
559+ yield * Effect . forEach ( queues . values ( ) , ( queue ) => terminateQueue ( queue , terminal ) , {
560+ discard : true ,
561+ } ) ;
567562 } ,
568563 ) ;
569564
570- // Server shutdown intentionally clears them; a provider-announced Stop
571- // must let consumers drain them before the stream completes.
572- const endSubscribers = Effect . fn ( "ProviderSessionManager.endSubscribers" ) ( function * (
573- entry : LiveSessionEntry ,
574- ) {
575- const subscribers = yield * Ref . getAndSet ( entry . eventSubscribers , new Map ( ) ) ;
576- yield * Effect . forEach ( subscribers . values ( ) , ( queue ) => Queue . end ( queue ) , {
577- discard : true ,
565+ const failSubscribers = ( entry : LiveSessionEntry , detail : string ) =>
566+ terminateSubscribers ( entry , {
567+ type : "failure" ,
568+ cause : Cause . fail (
569+ new ProviderAdapter . ProviderAdapterEventStreamError ( {
570+ driver : entry . runtime . driver ,
571+ providerSessionId : entry . runtime . providerSessionId ,
572+ cause : detail ,
573+ } ) ,
574+ ) ,
578575 } ) ;
579- } ) ;
580576
581577 const cancelIdleFiber = ( fiber : Fiber . Fiber < void , never > | null ) =>
582578 fiber === null ? Effect . void : Fiber . interrupt ( fiber ) . pipe ( Effect . ignore ) ;
@@ -1046,9 +1042,10 @@ export const layerWithOptions = (
10461042 yield * cancelIdleFiber ( entry . idleFiber ) ;
10471043 }
10481044 if ( input . gracefulSubscribers === true ) {
1049- yield * endSubscribers ( entry ) ;
1045+ yield * terminateSubscribers ( entry , { type : "end" } ) ;
10501046 } else if ( input . reason === "server_shutdown" ) {
1051- yield * interruptSubscribers ( entry ) ;
1047+ // Shutdown discards buffered work; interruption leaves settlement to recovery.
1048+ yield * terminateSubscribers ( entry , { type : "interrupt" } ) ;
10521049 } else {
10531050 yield * failSubscribers (
10541051 entry ,
@@ -1677,24 +1674,24 @@ export const layerWithOptions = (
16771674
16781675 const makeEventSubscription = Effect . fn ( "ProviderSessionManager.makeEventSubscription" ) (
16791676 function * (
1680- subscribers : Ref . Ref <
1681- ReadonlyMap < number , Queue . Queue < ProviderSessionEventSignal , Cause . Done > >
1682- > ,
1677+ subscribers : LiveSessionEntry [ "eventSubscribers" ] ,
16831678 ) : Effect . fn . Return < ProviderAdapter . ProviderAdapterV2EventSubscription > {
16841679 const queue = yield * Queue . unbounded < ProviderSessionEventSignal , Cause . Done > ( ) ;
16851680 const subscriberId = yield * Ref . getAndUpdate ( nextSubscriberId , ( value ) => value + 1 ) ;
1686- yield * Ref . update ( subscribers , ( current ) => {
1687- const updated = new Map ( current ) ;
1688- updated . set ( subscriberId , queue ) ;
1689- return updated ;
1681+ const terminal = yield * Ref . modify ( subscribers , ( current ) => {
1682+ if ( current . terminal !== null ) return [ current . terminal , current ] as const ;
1683+ const queues = new Map ( current . queues ) ;
1684+ queues . set ( subscriberId , queue ) ;
1685+ return [ null , { ...current , queues } ] as const ;
16901686 } ) ;
1687+ if ( terminal !== null ) yield * terminateQueue ( queue , terminal ) ;
16911688 const close = Ref . modify ( subscribers , ( current ) => {
1692- if ( ! current . has ( subscriberId ) ) {
1689+ if ( ! current . queues . has ( subscriberId ) ) {
16931690 return [ false , current ] as const ;
16941691 }
1695- const updated = new Map ( current ) ;
1696- updated . delete ( subscriberId ) ;
1697- return [ true , updated ] as const ;
1692+ const queues = new Map ( current . queues ) ;
1693+ queues . delete ( subscriberId ) ;
1694+ return [ true , { ... current , queues } ] as const ;
16981695 } ) . pipe (
16991696 Effect . flatMap ( ( removed ) =>
17001697 removed
@@ -1716,9 +1713,7 @@ export const layerWithOptions = (
17161713
17171714 const decorateRuntime = (
17181715 runtime : ProviderAdapter . ProviderAdapterV2SessionRuntime ,
1719- eventSubscribers : Ref . Ref <
1720- ReadonlyMap < number , Queue . Queue < ProviderSessionEventSignal , Cause . Done > >
1721- > ,
1716+ eventSubscribers : LiveSessionEntry [ "eventSubscribers" ] ,
17221717 closeObservers : LiveSessionEntry [ "closeObservers" ] ,
17231718 ) : ProviderAdapter . ProviderAdapterV2SessionRuntime => {
17241719 const providerSessionId = runtime . providerSessionId ;
@@ -2116,11 +2111,7 @@ export const layerWithOptions = (
21162111 cause : "Provider event stream ended unexpectedly." ,
21172112 } ) ,
21182113 ) ;
2119- yield * publishToSubscribers ( entry . eventSubscribers , {
2120- type : "failure" ,
2121- cause,
2122- } ) ;
2123- yield * Ref . set ( entry . eventSubscribers , new Map ( ) ) ;
2114+ yield * terminateSubscribers ( entry , { type : "failure" , cause } ) ;
21242115 // lastError is the thread banner, so it gets the same bounded
21252116 // message as a failed turn; the raw cause survives only in the log.
21262117 yield * Effect . logWarning ( "orchestration-v2.provider-session-runtime-failed" , {
@@ -2279,9 +2270,10 @@ export const layerWithOptions = (
22792270 attributes : { provider : adapter . driver , operation : "open" } ,
22802271 } ) ,
22812272 ) ;
2282- const eventSubscribers = yield * Ref . make <
2283- ReadonlyMap < number , Queue . Queue < ProviderSessionEventSignal , Cause . Done > >
2284- > ( new Map ( ) ) ;
2273+ const eventSubscribers = yield * Ref . make < ProviderSessionSubscribers > ( {
2274+ queues : new Map ( ) ,
2275+ terminal : null ,
2276+ } ) ;
22852277 const closeObservers = yield * Ref . make < ReadonlySet < Effect . Effect < void > > | null > (
22862278 new Set ( ) ,
22872279 ) ;
0 commit comments