@@ -433,6 +433,9 @@ const makeProviderAdapter = Effect.fnUntraced(function* (
433433 state : Ref . Ref < TestProviderRuntimeState > ,
434434 options : {
435435 readonly failEventStream ?: boolean ;
436+ readonly readInstructionInvalidations ?: Effect . Effect <
437+ ReadonlyArray < OrchestrationV2ProviderThread >
438+ > ;
436439 readonly normalizeThreadLoadModelSelection ?: ( selection : ModelSelection ) => ModelSelection ;
437440 readonly capabilities ?: OrchestrationV2ProviderCapabilities ;
438441 readonly extensionStatuses ?: OrchestrationV2ProviderSession [ "extensionStatuses" ] ;
@@ -520,6 +523,9 @@ const makeProviderAdapter = Effect.fnUntraced(function* (
520523 instanceId : ProviderInstanceId . make ( "codex" ) ,
521524 driver : CODEX_DRIVER ,
522525 providerSessionId : input . providerSessionId ,
526+ ...( options . readInstructionInvalidations === undefined
527+ ? { }
528+ : { readInstructionInvalidations : options . readInstructionInvalidations } ) ,
523529 ...( options . normalizeThreadLoadModelSelection === undefined
524530 ? { }
525531 : { normalizeThreadLoadModelSelection : options . normalizeThreadLoadModelSelection } ) ,
@@ -605,6 +611,9 @@ function layerTest(input: {
605611 readonly flakyReleaseWrites ?: FlakyReleaseWrites ;
606612 readonly pauseAttachWrite ?: Parameters < typeof layerPausingAttachEventSink > [ 0 ] ;
607613 readonly beforeUnchangedWrite ?: Ref . Ref < Effect . Effect < void , EventSink . EventSinkWriteError > > ;
614+ readonly readInstructionInvalidations ?: Effect . Effect <
615+ ReadonlyArray < OrchestrationV2ProviderThread >
616+ > ;
608617 readonly pauseResolve ?: {
609618 readonly armed : Ref . Ref < boolean > ;
610619 readonly paused : Deferred . Deferred < void > ;
@@ -635,6 +644,9 @@ function layerTest(input: {
635644 const layerRegistry = Layer . unwrap (
636645 makeProviderAdapter ( input . state , {
637646 failEventStream : input . failEventStream ?? false ,
647+ ...( input . readInstructionInvalidations === undefined
648+ ? { }
649+ : { readInstructionInvalidations : input . readInstructionInvalidations } ) ,
638650 ...( input . normalizeThreadLoadModelSelection === undefined
639651 ? { }
640652 : { normalizeThreadLoadModelSelection : input . normalizeThreadLoadModelSelection } ) ,
@@ -3782,6 +3794,8 @@ it.effect.each([
37823794 "failed-event" ,
37833795 "release-after-failed-event" ,
37843796 "retry-after-failed-release" ,
3797+ "detach-after-failed-event" ,
3798+ "release-before-event" ,
37853799 "newer-run" ,
37863800 "newer-session" ,
37873801] as const ) (
@@ -3792,6 +3806,9 @@ it.effect.each([
37923806 const beforeUnchangedWrite = yield * Ref . make <
37933807 Effect . Effect < void , EventSink . EventSinkWriteError >
37943808 > ( Effect . void ) ;
3809+ const adapterInvalidations = yield * Ref . make < ReadonlyArray < OrchestrationV2ProviderThread > > (
3810+ [ ] ,
3811+ ) ;
37953812 yield * Effect . gen ( function * ( ) {
37963813 const eventSink = yield * EventSink . EventSinkV2 ;
37973814 const idAllocator = yield * IdAllocator . IdAllocatorV2 ;
@@ -3842,24 +3859,34 @@ it.effect.each([
38423859 modelSelection,
38433860 runtimePolicy,
38443861 } ) ;
3862+ const invalidation = {
3863+ ...providerThread ,
3864+ nativeMetadata : { title : "stale title" , acpInstructions : null } ,
3865+ } ;
3866+ if ( owner === "release-before-event" ) {
3867+ // The adapter has recorded compaction, but the event pump has not seen it.
3868+ yield * Ref . set ( adapterInvalidations , [ invalidation ] ) ;
3869+ yield * manager . release ( { providerSessionId, reason : "manual_shutdown" } ) ;
3870+ const projection = yield * projectionStore . getThreadRecords ( threadId , [ "providerThreads" ] ) ;
3871+ assert . isNull ( projection . providerThreads [ 0 ] ?. nativeMetadata ?. acpInstructions ) ;
3872+ return ;
3873+ }
38453874 const subscription = yield * runtime . subscribeEvents ! ;
38463875 const queue = ( yield * Ref . get ( state ) ) . eventQueues . get ( String ( providerSessionId ) ) ;
38473876 assert . isDefined ( queue ) ;
38483877 const failedWrite = Effect . fail ( new EventSink . EventSinkWriteError ( { eventCount : 1 } ) ) ;
38493878 if (
38503879 owner === "failed-event" ||
38513880 owner === "release-after-failed-event" ||
3852- owner === "retry-after-failed-release"
3881+ owner === "retry-after-failed-release" ||
3882+ owner === "detach-after-failed-event"
38533883 ) {
38543884 yield * Ref . set ( beforeUnchangedWrite , failedWrite ) ;
38553885 }
38563886 yield * Queue . offer ( queue ! , {
38573887 type : "provider_thread.updated" ,
38583888 driver : CODEX_DRIVER ,
3859- providerThread : {
3860- ...providerThread ,
3861- nativeMetadata : { title : "stale title" , acpInstructions : null } ,
3862- } ,
3889+ providerThread : invalidation ,
38633890 } ) ;
38643891 const completionEventId = yield * idAllocator . allocate . event ( {
38653892 threadId,
@@ -3923,9 +3950,13 @@ it.effect.each([
39233950 yield * manager . release ( { providerSessionId, reason : "manual_shutdown" } ) ;
39243951 if (
39253952 owner === "release-after-failed-event" ||
3926- owner === "retry-after-failed-release"
3953+ owner === "retry-after-failed-release" ||
3954+ owner === "detach-after-failed-event"
39273955 ) {
3928- const release = manager . release ( { providerSessionId, reason : "manual_shutdown" } ) ;
3956+ const release =
3957+ owner === "detach-after-failed-event"
3958+ ? manager . detach ( { providerSessionId, threadId } )
3959+ : manager . release ( { providerSessionId, reason : "manual_shutdown" } ) ;
39293960 if ( owner === "retry-after-failed-release" ) {
39303961 yield * Ref . set ( beforeUnchangedWrite , failedWrite ) ;
39313962 assert . isTrue ( Exit . isFailure ( yield * Effect . exit ( release ) ) ) ;
@@ -3995,7 +4026,8 @@ it.effect.each([
39954026 owner === "failed-close" ||
39964027 owner === "failed-event" ||
39974028 owner === "release-after-failed-event" ||
3998- owner === "retry-after-failed-release"
4029+ owner === "retry-after-failed-release" ||
4030+ owner === "detach-after-failed-event"
39994031 ? {
40004032 ...before ,
40014033 nativeMetadata : {
@@ -4006,7 +4038,21 @@ it.effect.each([
40064038 }
40074039 : before ,
40084040 ) ;
4009- } ) . pipe ( Effect . provide ( layerTest ( { state, idleTimeoutMs : 1000 , beforeUnchangedWrite } ) ) ) ;
4041+ } ) . pipe (
4042+ Effect . provide (
4043+ layerTest ( {
4044+ state,
4045+ idleTimeoutMs : 1000 ,
4046+ beforeUnchangedWrite,
4047+ ...( owner === "detach-after-failed-event"
4048+ ? { capabilities : ExclusiveCapabilities }
4049+ : { } ) ,
4050+ ...( owner === "release-before-event"
4051+ ? { readInstructionInvalidations : Ref . get ( adapterInvalidations ) }
4052+ : { } ) ,
4053+ } ) ,
4054+ ) ,
4055+ ) ;
40104056 } ) ,
40114057) ;
40124058
0 commit comments