@@ -4223,22 +4223,26 @@ describe("CodexAdapterV2 post-settle continuation", () => {
42234223 const scenario = "codex-retained-image" ;
42244224 const base = finalAnswerTranscript ( scenario , [ { id : "answer" , text : "Done." } ] ) ;
42254225 const completion = yield * Deferred . make < void > ( ) ;
4226+ const secondCompletion = yield * Deferred . make < void > ( ) ;
42264227 const projected = yield * Deferred . make < void > ( ) ;
4228+ const drained = yield * Deferred . make < void > ( ) ;
42274229 const expected = "Done.\n\n" ;
4228- const imageEvent = ( phase : "started" | "completed" ) => ( {
4230+ const imageEvent = ( phase : "started" | "completed" , second = false ) => ( {
42294231 type : "emit_inbound" as const ,
4230- label : `image-${ phase } ` ,
4232+ label : `image-${ phase } ${ second ? "-second" : "" } ` ,
42314233 frame : {
42324234 method : `item/${ phase } ` ,
42334235 params : {
42344236 threadId : `native-${ scenario } -thread` ,
42354237 turnId : `native-${ scenario } -turn` ,
42364238 item : {
42374239 type : "imageGeneration" ,
4238- id : "late-image" ,
4240+ id : second ? "second-image" : "late-image" ,
42394241 status : phase === "started" ? "inProgress" : "completed" ,
42404242 result : "" ,
4241- ...( phase === "completed" ? { savedPath : "/tmp/late image.png" } : { } ) ,
4243+ ...( phase === "completed"
4244+ ? { savedPath : second ? "/tmp/second.png" : "/tmp/late image.png" }
4245+ : { } ) ,
42424246 } ,
42434247 } ,
42444248 } ,
@@ -4249,17 +4253,26 @@ describe("CodexAdapterV2 post-settle continuation", () => {
42494253 entries : [
42504254 ...base . entries . slice ( 0 , - 2 ) ,
42514255 imageEvent ( "started" ) ,
4256+ imageEvent ( "started" , true ) ,
42524257 ...base . entries . slice ( - 2 ) ,
42534258 imageEvent ( "completed" ) ,
4259+ imageEvent ( "completed" , true ) ,
42544260 ] ,
42554261 } ) ,
42564262 ( event ) =>
42574263 event . type === "message.updated" && event . message . text === expected
42584264 ? Deferred . succeed ( projected , undefined )
4259- : Effect . void ,
4265+ : event . type === "background_work.updated" && ! event . pending
4266+ ? Deferred . succeed ( drained , undefined )
4267+ : Effect . void ,
42604268 undefined ,
42614269 undefined ,
4262- ( entry ) => ( entry . label === "image-completed" ? Deferred . await ( completion ) : Effect . void ) ,
4270+ ( entry ) =>
4271+ entry . label === "image-completed"
4272+ ? Deferred . await ( completion )
4273+ : entry . label === "image-completed-second"
4274+ ? Deferred . await ( secondCompletion )
4275+ : Effect . void ,
42634276 ) ;
42644277 yield * harness . runtime . startTurn (
42654278 makeCodexTestTurnInput ( {
@@ -4280,6 +4293,21 @@ describe("CodexAdapterV2 post-settle continuation", () => {
42804293 if ( outcome === "complete" ) {
42814294 yield * Deferred . succeed ( completion , undefined ) ;
42824295 yield * Deferred . await ( projected ) ;
4296+ assert . deepEqual (
4297+ [ yield * threadPending , yield * harness . hasPendingBackgroundWork ] ,
4298+ [ true , true ] ,
4299+ ) ;
4300+ assert . isFalse (
4301+ harness . events . some (
4302+ ( event ) => event . type === "background_work.updated" && ! event . pending ,
4303+ ) ,
4304+ ) ;
4305+ yield * Deferred . succeed ( secondCompletion , undefined ) ;
4306+ yield * Deferred . await ( drained ) ;
4307+ assert . strictEqual (
4308+ assistantMessages ( harness . events ) . at ( - 1 ) ?. message . text ,
4309+ `${ expected } \n\n` ,
4310+ ) ;
42834311 const messages = assistantMessages ( harness . events ) ;
42844312 assert . strictEqual ( messages . at ( - 1 ) ?. message . id , messages [ 0 ] ?. message . id ) ;
42854313 assert . strictEqual ( messages . at ( - 1 ) ?. message . streaming , false ) ;
@@ -4290,10 +4318,30 @@ describe("CodexAdapterV2 post-settle continuation", () => {
42904318 requestRuntimeRestart : true ,
42914319 } ) ;
42924320 }
4321+ yield * Deferred . await ( drained ) ;
42934322 assert . deepEqual (
42944323 [ yield * threadPending , yield * harness . hasPendingBackgroundWork ] ,
42954324 [ false , false ] ,
42964325 ) ;
4326+ const started = harness . events . findIndex (
4327+ ( event ) => event . type === "background_work.updated" && event . pending ,
4328+ ) ;
4329+ const terminal = harness . events . findIndex ( ( event ) => event . type === "turn.terminal" ) ;
4330+ const finished = harness . events . findIndex (
4331+ ( event ) => event . type === "background_work.updated" && ! event . pending ,
4332+ ) ;
4333+ assert . isAtLeast ( started , 0 ) ;
4334+ assert . isAbove ( terminal , started ) ;
4335+ assert . isAbove ( finished , terminal ) ;
4336+ if ( outcome === "complete" ) {
4337+ assert . isAbove (
4338+ finished ,
4339+ harness . events . findLastIndex (
4340+ ( event ) =>
4341+ event . type === "turn_item.updated" && event . turnItem . type === "assistant_message" ,
4342+ ) ,
4343+ ) ;
4344+ }
42974345 assert . lengthOf ( harness . terminalEvents ( ) , 1 ) ;
42984346 assert . deepEqual ( pendingBefore , [ true , true ] ) ;
42994347 } ) . pipe (
0 commit comments