@@ -240,6 +240,7 @@ const makeTestRunner = (
240240 } ) ) ,
241241 } ,
242242 latestVersions : Layer . Layer < ProviderLatestVersions . ProviderLatestVersions > = ProviderLatestVersions . layer ,
243+ drainBegins ?: Ref . Ref < number > ,
243244) =>
244245 Effect . service ( ProviderMaintenanceRunner . ProviderMaintenanceRunner ) . pipe (
245246 Effect . provide (
@@ -264,16 +265,21 @@ const makeTestRunner = (
264265 saveWorkTurnCount : 0 ,
265266 } ) ,
266267 beginAndAwait : ( ) =>
267- Effect . succeed ( {
268- shutdownId : GracefulShutdownId . make ( "test-shutdown" ) ,
269- phase : "quiesced" ,
270- scope : { type : "environment" } ,
271- timedOut : false ,
272- activeRunCount : 0 ,
273- saveWorkPrompted : false ,
274- saveWorkTurnCount : 0 ,
275- elapsedMs : 0 ,
276- } ) ,
268+ ( drainBegins === undefined
269+ ? Effect . void
270+ : Ref . update ( drainBegins , ( count ) => count + 1 )
271+ ) . pipe (
272+ Effect . as ( {
273+ shutdownId : GracefulShutdownId . make ( "test-shutdown" ) ,
274+ phase : "quiesced" as const ,
275+ scope : { type : "environment" as const } ,
276+ timedOut : false ,
277+ activeRunCount : 0 ,
278+ saveWorkPrompted : false ,
279+ saveWorkTurnCount : 0 ,
280+ elapsedMs : 0 ,
281+ } ) ,
282+ ) ,
277283 complete : ( ) => Effect . void ,
278284 } ) ,
279285 ) ,
@@ -318,6 +324,7 @@ describe("providerMaintenanceRunner", () => {
318324 [
319325 [ "queued" , "Waiting for another provider update to finish." ] ,
320326 [ "running" , "Checking for the latest version" ] ,
327+ [ "running" , "Waiting for agents to finish before updating" ] ,
321328 [ "running" , "Running native-agent update" ] ,
322329 [ "running" , "Verifying the installed version" ] ,
323330 [ "succeeded" , "Provider updated." ] ,
@@ -353,6 +360,7 @@ describe("providerMaintenanceRunner", () => {
353360 const calls : Array < { command : string ; args : ReadonlyArray < string > } > = [ ] ;
354361 const refreshedInstanceIds : Array < ProviderInstanceId > = [ ] ;
355362 return Effect . gen ( function * ( ) {
363+ const drainBegins = yield * Ref . make ( 0 ) ;
356364 const { registry, updateStatesRef, providersRef } = yield * makeRegistry ( {
357365 ...baseProvider ,
358366 version : "2.1.309" ,
@@ -366,38 +374,44 @@ describe("providerMaintenanceRunner", () => {
366374 message : "Update available." ,
367375 } ,
368376 } ) ;
369- const updater = yield * makeTestRunner ( {
370- ...registry ,
371- refreshInstance : ( instanceId ) => {
372- refreshedInstanceIds . push ( instanceId ) ;
373- return Ref . updateAndGet ( providersRef , ( providers ) =>
374- providers . map ( ( provider ) =>
375- provider . instanceId === instanceId
376- ? {
377- ...provider ,
378- version : "2.1.310" ,
379- ...probe ,
380- checkedAt : "2026-04-10T00:00:01.000Z" ,
381- }
382- : provider ,
377+ const updater = yield * makeTestRunner (
378+ {
379+ ...registry ,
380+ refreshInstance : ( instanceId ) => {
381+ refreshedInstanceIds . push ( instanceId ) ;
382+ return Ref . updateAndGet ( providersRef , ( providers ) =>
383+ providers . map ( ( provider ) =>
384+ provider . instanceId === instanceId
385+ ? {
386+ ...provider ,
387+ version : "2.1.310" ,
388+ ...probe ,
389+ checkedAt : "2026-04-10T00:00:01.000Z" ,
390+ }
391+ : provider ,
392+ ) ,
393+ ) ;
394+ } ,
395+ getProviderMaintenanceCapabilitiesForInstance : ( ) =>
396+ Effect . succeed (
397+ makeProviderMaintenanceCapabilities ( {
398+ provider : CODEX_DRIVER ,
399+ packageName : "@anthropic-ai/claude-code" ,
400+ updateExecutable : "claude" ,
401+ updateArgs : [ "update" ] ,
402+ updateLockKey : "claudeAgent-native" ,
403+ } ) ,
383404 ) ,
384- ) ;
385405 } ,
386- getProviderMaintenanceCapabilitiesForInstance : ( ) =>
387- Effect . succeed (
388- makeProviderMaintenanceCapabilities ( {
389- provider : CODEX_DRIVER ,
390- packageName : "@anthropic-ai/claude-code" ,
391- updateExecutable : "claude" ,
392- updateArgs : [ "update" ] ,
393- updateLockKey : "claudeAgent-native" ,
394- } ) ,
395- ) ,
396- } ) ;
406+ undefined ,
407+ undefined ,
408+ drainBegins ,
409+ ) ;
397410
398411 const result = yield * updater . updateProvider ( CODEX_DRIVER ) ;
399412 assert . deepStrictEqual ( refreshedInstanceIds , [ CODEX_INSTANCE_ID ] ) ;
400413 assert . deepStrictEqual ( calls , skip ? [ ] : [ { command : "claude" , args : [ "update" ] } ] ) ;
414+ assert . strictEqual ( yield * Ref . get ( drainBegins ) , skip ? 0 : 1 ) ;
401415 if ( ! skip ) return ;
402416 assert . strictEqual ( result . providers [ 0 ] ?. updateState ?. status , "succeeded" ) ;
403417 assert . strictEqual ( result . providers [ 0 ] ?. updateState ?. message , "Already up to date." ) ;
@@ -604,7 +618,7 @@ describe("providerMaintenanceRunner", () => {
604618 } ) ;
605619
606620 yield * updater . updateProvider ( CODEX_DRIVER ) ;
607- assert . deepStrictEqual ( fresh , [ false , true , true ] ) ;
621+ assert . deepStrictEqual ( fresh , [ false , true , true , true ] ) ;
608622 assert . deepStrictEqual ( calls , [
609623 { command : "/opt/homebrew/bin/brew" , args : [ "upgrade" , "--cask" , "codex" ] } ,
610624 ] ) ;
0 commit comments