@@ -509,20 +509,39 @@ async def run_owned(label: str, disabled: bool, sensitive: bool) -> str:
509509
510510 restrictive = asyncio .create_task (run_owned ("restrictive" , True , False ))
511511 permissive = asyncio .create_task (run_owned ("permissive" , False , True ))
512+
513+ async def callers_closed () -> None :
514+ await asyncio .gather (* (event .wait () for event in closed .values ()))
515+
516+ barrier = asyncio .create_task (callers_closed ())
517+ owners = (restrictive , permissive )
512518 try :
513- # Two native engines can start slowly on loaded macOS runners.
514- await asyncio .wait_for (
515- asyncio .gather (* (event .wait () for event in [* entered .values (), * closed .values ()])), 30
519+ # Both policies must be retained after admission and caller-scope close.
520+ # Callback scheduling need not let both tools enter before either returns.
521+ ready , _ = await asyncio .wait (
522+ (barrier , * owners ), timeout = 30 , return_when = asyncio .FIRST_COMPLETED
516523 )
517- except BaseException :
524+ for owner in owners :
525+ if owner in ready :
526+ # Surface setup/tool failures instead of hiding them in timeout cleanup.
527+ owner .result ()
528+ raise AssertionError ("Policy owner finished before the callbacks were released" )
529+ if barrier not in ready :
530+ raise TimeoutError (
531+ {
532+ label : {"entered" : entered [label ].is_set (), "closed" : closed [label ].is_set ()}
533+ for label in labels
534+ }
535+ )
536+ await barrier
518537 release .set ()
519- restrictive .cancel ()
520- permissive .cancel ()
521- await asyncio .gather (restrictive , permissive , return_exceptions = True )
522- raise
523- else :
538+ results = await asyncio .gather (* owners )
539+ finally :
524540 release .set ()
525- results = await asyncio .gather (restrictive , permissive )
541+ for waiter in (barrier , * owners ):
542+ if not waiter .done ():
543+ waiter .cancel ()
544+ await asyncio .gather (barrier , * owners , return_exceptions = True )
526545 async with ScriptedResponses (
527546 [tool_call ("observe" , {"key" : "fresh" }, call_id = "fresh" )], [text ("done" )]
528547 ) as peer :
0 commit comments