@@ -14,6 +14,7 @@ import type {
1414 TurnItemId ,
1515} from "@t3tools/contracts" ;
1616import * as Clock from "effect/Clock" ;
17+ import * as Deferred from "effect/Deferred" ;
1718import * as Duration from "effect/Duration" ;
1819import * as Effect from "effect/Effect" ;
1920import * as Fiber from "effect/Fiber" ;
@@ -37,6 +38,8 @@ export type OrchestratorV2ScenarioStep =
3738 | {
3839 readonly type : "advance_clock" ;
3940 readonly duration : Duration . Input ;
41+ /** Wait until the jump idle-releases this thread's provider session. */
42+ readonly awaitProviderSessionRelease ?: ThreadId ;
4043 }
4144 | {
4245 readonly type : "await" ;
@@ -271,9 +274,21 @@ export function runOrchestratorV2Scenario(
271274 const orchestrator = yield * Orchestrator . OrchestratorV2 ;
272275 const storedEventGroups : Array < ReadonlyArray < OrchestrationV2StoredEvent > > = [ ] ;
273276 const observedStoredEvents = yield * Ref . make < Array < OrchestrationV2StoredEvent > > ( [ ] ) ;
277+ let releaseWatch :
278+ | { readonly threadId : ThreadId ; readonly released : Deferred . Deferred < void > }
279+ | undefined ;
274280 yield * orchestrator . streamStoredEvents . pipe (
275- Stream . runForEach ( ( event ) =>
276- Ref . update ( observedStoredEvents , ( existing ) => [ ...existing , event ] ) ,
281+ Stream . runForEach ( ( stored ) =>
282+ Ref . update ( observedStoredEvents , ( existing ) => [ ...existing , stored ] ) . pipe (
283+ Effect . andThen (
284+ releaseWatch !== undefined &&
285+ stored . event . type === "provider-session.updated" &&
286+ stored . event . threadId === releaseWatch . threadId &&
287+ stored . event . payload . status === "stopped"
288+ ? Deferred . succeed ( releaseWatch . released , undefined )
289+ : Effect . void ,
290+ ) ,
291+ ) ,
277292 ) ,
278293 Effect . forkScoped ,
279294 ) ;
@@ -647,9 +662,28 @@ export function runOrchestratorV2Scenario(
647662 ) ;
648663 break ;
649664 }
650- case "advance_clock" :
665+ case "advance_clock" : {
666+ if ( step . awaitProviderSessionRelease === undefined ) {
667+ yield * TestClock . adjust ( step . duration ) ;
668+ break ;
669+ }
670+ // The release runs on a woken fiber; a dispatch before it commits cancels it.
671+ const released = yield * Deferred . make < void > ( ) ;
672+ releaseWatch = { threadId : step . awaitProviderSessionRelease , released } ;
651673 yield * TestClock . adjust ( step . duration ) ;
674+ const settled = yield * Deferred . await ( released ) . pipe (
675+ Effect . timeoutOption ( Duration . millis ( SCENARIO_WAIT_DEADLINE_MS ) ) ,
676+ Effect . provideService ( Clock . Clock , Clock . Clock . defaultValue ( ) ) ,
677+ ) ;
678+ releaseWatch = undefined ;
679+ if ( Option . isNone ( settled ) ) {
680+ return yield * new OrchestratorV2ScenarioStepError ( {
681+ scenario : scenario . name ,
682+ step : `advance_clock:${ step . awaitProviderSessionRelease } :no_provider_session_release` ,
683+ } ) ;
684+ }
652685 break ;
686+ }
653687 case "await" :
654688 yield * awaitDispatch ( step . key ) ;
655689 break ;
0 commit comments