@@ -3325,27 +3325,32 @@ describe("CodexAdapterV2 post-settle continuation", () => {
33253325 ) ;
33263326
33273327 it . effect . each ( [ "complete" , "stop" ] as const ) (
3328- "retains a generating image after settlement until %s" ,
3328+ "retains generating images after settlement until %s" ,
33293329 ( outcome ) =>
33303330 Effect . gen ( function * ( ) {
33313331 const scenario = "codex-retained-image" ;
33323332 const base = finalAnswerTranscript ( scenario , [ { id : "answer" , text : "Done." } ] ) ;
3333- const completion = yield * Deferred . make < void > ( ) ;
3333+ const completions = {
3334+ first : yield * Deferred . make < void > ( ) ,
3335+ second : yield * Deferred . make < void > ( ) ,
3336+ } ;
3337+ const projected = yield * Deferred . make < void > ( ) ;
33343338 const drained = yield * Deferred . make < void > ( ) ;
3335- const imageEvent = ( phase : "started" | "completed" ) => ( {
3339+ const firstText = "Done.\n\n" ;
3340+ const imageEvent = ( image : "first" | "second" , phase : "started" | "completed" ) => ( {
33363341 type : "emit_inbound" as const ,
3337- label : `image-${ phase } ` ,
3342+ label : `${ image } -${ phase } ` ,
33383343 frame : {
33393344 method : `item/${ phase } ` ,
33403345 params : {
33413346 threadId : `native-${ scenario } -thread` ,
33423347 turnId : `native-${ scenario } -turn` ,
33433348 item : {
33443349 type : "imageGeneration" ,
3345- id : "late- image" ,
3350+ id : image ,
33463351 status : phase === "started" ? "inProgress" : "completed" ,
33473352 result : "" ,
3348- ...( phase === "completed" ? { savedPath : " /tmp/late .png" } : { } ) ,
3353+ ...( phase === "completed" ? { savedPath : ` /tmp/${ image } .png` } : { } ) ,
33493354 } ,
33503355 } ,
33513356 } ,
@@ -3355,18 +3360,27 @@ describe("CodexAdapterV2 post-settle continuation", () => {
33553360 scenario,
33563361 entries : [
33573362 ...base . entries . slice ( 0 , - 2 ) ,
3358- imageEvent ( "started" ) ,
3363+ imageEvent ( "first" , "started" ) ,
3364+ imageEvent ( "second" , "started" ) ,
33593365 ...base . entries . slice ( - 2 ) ,
3360- imageEvent ( "completed" ) ,
3366+ imageEvent ( "first" , "completed" ) ,
3367+ imageEvent ( "second" , "completed" ) ,
33613368 ] ,
33623369 } ) ,
33633370 ( event ) =>
3364- event . type === "background_work.updated" && ! event . pending
3365- ? Deferred . succeed ( drained , undefined )
3366- : Effect . void ,
3371+ event . type === "message.updated" && event . message . text === firstText
3372+ ? Deferred . succeed ( projected , undefined )
3373+ : event . type === "background_work.updated" && ! event . pending
3374+ ? Deferred . succeed ( drained , undefined )
3375+ : Effect . void ,
33673376 undefined ,
33683377 undefined ,
3369- ( entry ) => ( entry . label === "image-completed" ? Deferred . await ( completion ) : Effect . void ) ,
3378+ ( entry ) =>
3379+ entry . label === "first-completed"
3380+ ? Deferred . await ( completions . first )
3381+ : entry . label === "second-completed"
3382+ ? Deferred . await ( completions . second )
3383+ : Effect . void ,
33703384 ) ;
33713385 yield * harness . runtime . startTurn (
33723386 makeCodexTestTurnInput ( {
@@ -3384,9 +3398,16 @@ describe("CodexAdapterV2 post-settle continuation", () => {
33843398 ] ) ;
33853399 assert . deepEqual ( yield * pending , [ true , true ] ) ;
33863400 assert . strictEqual ( assistantMessages ( harness . events ) . at ( - 1 ) ?. message . text , "Done." ) ;
3401+ const cleared = ( ) =>
3402+ harness . events . some ( ( e ) => e . type === "background_work.updated" && ! e . pending ) ;
33873403
33883404 if ( outcome === "complete" ) {
3389- yield * Deferred . succeed ( completion , undefined ) ;
3405+ yield * Deferred . succeed ( completions . first , undefined ) ;
3406+ yield * Deferred . await ( projected ) ;
3407+ // The second image is still generating, so the first must not release the turn.
3408+ assert . deepEqual ( yield * pending , [ true , true ] ) ;
3409+ assert . isFalse ( cleared ( ) ) ;
3410+ yield * Deferred . succeed ( completions . second , undefined ) ;
33903411 } else {
33913412 yield * harness . runtime . interruptTurn ( {
33923413 providerThread : harness . providerThread ,
@@ -3397,7 +3418,7 @@ describe("CodexAdapterV2 post-settle continuation", () => {
33973418 yield * Deferred . await ( drained ) ;
33983419 assert . deepEqual ( yield * pending , [ false , false ] ) ;
33993420 assert . lengthOf ( harness . terminalEvents ( ) , 1 ) ;
3400- // Run ingestion follows these updates, so they must bracket the terminal and the image .
3421+ // Run ingestion follows these updates, so they must bracket the terminal and the images .
34013422 const indexOf = ( predicate : ( event : ProviderAdapter . ProviderAdapterV2Event ) => boolean ) =>
34023423 harness . events . findIndex ( predicate ) ;
34033424 const started = indexOf ( ( e ) => e . type === "background_work.updated" && e . pending ) ;
@@ -3408,12 +3429,13 @@ describe("CodexAdapterV2 post-settle continuation", () => {
34083429 assert . isAbove ( finished , terminal ) ;
34093430 if ( outcome === "complete" ) {
34103431 const messages = assistantMessages ( harness . events ) ;
3411- const projected = indexOf (
3432+ const projectedBoth = indexOf (
34123433 ( e ) =>
3413- e . type === "message.updated" && e . message . text === "Done.\n\n" ,
3434+ e . type === "message.updated" &&
3435+ e . message . text === `${ firstText } \n\n` ,
34143436 ) ;
3415- assert . isAbove ( projected , terminal ) ;
3416- assert . isAbove ( finished , projected ) ;
3437+ assert . isAbove ( projectedBoth , terminal ) ;
3438+ assert . isAbove ( finished , projectedBoth ) ;
34173439 assert . strictEqual ( messages . at ( - 1 ) ?. message . id , messages [ 0 ] ?. message . id ) ;
34183440 assert . strictEqual ( messages . at ( - 1 ) ?. message . streaming , false ) ;
34193441 }
0 commit comments