@@ -1840,25 +1840,34 @@ it.effect.each(["Stop", "Force stop"] as const)(
18401840) ;
18411841
18421842it . effect . each ( [
1843- { followUp : "started its turn" , startedBeforeRelease : true } ,
1844- { followUp : "was promoted" , startedBeforeRelease : false } ,
1843+ { followUp : "started its turn" , startedBeforeRelease : true , switchesInstance : false } ,
1844+ { followUp : "was promoted" , startedBeforeRelease : false , switchesInstance : false } ,
1845+ { followUp : "switched provider instance" , startedBeforeRelease : true , switchesInstance : true } ,
18451846] ) (
1846- "Force stop keeps the session of a queued follow-up that $followUp" ,
1847- ( { startedBeforeRelease } ) =>
1847+ "Force stop keeps only the session of a queued follow-up that $followUp" ,
1848+ ( { startedBeforeRelease, switchesInstance } ) =>
18481849 Effect . scoped (
18491850 Effect . gen ( function * ( ) {
18501851 const cwd = yield * checkpointWorkspace ( "thread-stop-force-stop-follow-up" ) ;
18511852 const driver = adapter . driver ;
1852- const events = yield * Queue . unbounded < ProviderAdapter . ProviderAdapterV2Event > ( ) ;
1853+ const otherInstanceId = ProviderInstanceId . make ( "codex-other" ) ;
1854+ const eventQueues = new Map ( [
1855+ [ instanceId , yield * Queue . unbounded < ProviderAdapter . ProviderAdapterV2Event > ( ) ] ,
1856+ [ otherInstanceId , yield * Queue . unbounded < ProviderAdapter . ProviderAdapterV2Event > ( ) ] ,
1857+ ] ) ;
18531858 const started : Array < ProviderAdapter . ProviderAdapterV2TurnInput > = [ ] ;
18541859 const interrupted : Array < ProviderAdapter . ProviderAdapterV2InterruptInput > = [ ] ;
18551860 let opened = 0 ;
1856- const liveAdapter : ProviderAdapter . ProviderAdapterV2 [ "Service" ] = {
1861+ const liveAdapter = (
1862+ instanceId : ProviderInstanceId ,
1863+ ) : ProviderAdapter . ProviderAdapterV2 [ "Service" ] => ( {
18571864 ...adapter ,
1865+ instanceId,
18581866 openSession : ( input ) =>
18591867 Effect . gen ( function * ( ) {
18601868 opened += 1 ;
18611869 const now = yield * DateTime . now ;
1870+ const events = eventQueues . get ( instanceId ) ! ;
18621871 return {
18631872 instanceId,
18641873 driver,
@@ -1878,7 +1887,7 @@ it.effect.each([
18781887 events : Stream . fromQueue ( events ) ,
18791888 ensureThread : ( { threadId } ) =>
18801889 Effect . succeed ( {
1881- id : ProviderThreadId . make ( `provider-thread:codex :${ threadId } ` ) ,
1890+ id : ProviderThreadId . make ( `provider-thread:${ instanceId } :${ threadId } ` ) ,
18821891 driver,
18831892 providerInstanceId : instanceId ,
18841893 providerSessionId : input . providerSessionId ,
@@ -1926,7 +1935,7 @@ it.effect.each([
19261935 forkThread : ( ) => Effect . die ( "unused" ) ,
19271936 } ;
19281937 } ) ,
1929- } ;
1938+ } ) ;
19301939 // The settlement promotes the follow-up; optionally its turn starts before Force stop releases.
19311940 const layerSessionsStartingFollowUpFirst = Layer . effect (
19321941 ProviderSessionManager . ProviderSessionManagerV2 ,
@@ -1952,7 +1961,10 @@ it.effect.each([
19521961 EffectOutbox . layer . pipe ( Layer . provide ( layerDatabase ) ) ,
19531962 ProviderReplayHarness . layerWithRegistry (
19541963 { name : "thread-stop-force-stop-follow-up" } ,
1955- ProviderAdapterRegistry . layerFromAdapters ( [ liveAdapter ] ) ,
1964+ ProviderAdapterRegistry . layerFromAdapters ( [
1965+ liveAdapter ( instanceId ) ,
1966+ liveAdapter ( otherInstanceId ) ,
1967+ ] ) ,
19561968 { databaseLayer : layerDatabase , runEffectWorker : false } ,
19571969 ) ,
19581970 ) ,
@@ -1994,7 +2006,20 @@ it.effect.each([
19942006 yield * send ( threadId , "first" , "start_immediately" ) ;
19952007 yield * worker . drain ( ) ;
19962008 yield * Fiber . join ( firstRunning ) ;
1997- yield * send ( threadId , "follow-up" , "queue_after_active" ) ;
2009+ yield * orchestrator . dispatch ( {
2010+ type : "message.dispatch" ,
2011+ commandId : CommandId . make ( "send:force-stop-follow-up" ) ,
2012+ threadId,
2013+ messageId : MessageId . make ( "message:force-stop-follow-up" ) ,
2014+ text : "follow-up" ,
2015+ attachments : [ ] ,
2016+ dispatchMode : { type : "queue_after_active" } ,
2017+ ...( switchesInstance
2018+ ? { modelSelection : { ...modelSelection , instanceId : otherInstanceId } }
2019+ : { } ) ,
2020+ createdBy : "user" ,
2021+ creationSource : "web" ,
2022+ } ) ;
19982023
19992024 const result = yield * threads . forceStopThread ( { threadId } ) ;
20002025 yield * worker . drain ( ) ;
@@ -2006,12 +2031,16 @@ it.effect.each([
20062031 ) ;
20072032 assert . equal (
20082033 opened ,
2009- 1 ,
2034+ switchesInstance ? 2 : 1 ,
20102035 "Force stop tore down the session the follow-up was promoted onto" ,
20112036 ) ;
2012- const followUp = started [ 1 ] ! ;
2013- const providerSessionId = ( yield * orchestrator . getThreadProjection ( threadId ) )
2014- . providerThreads [ 0 ] ! . providerSessionId ! ;
2037+ const [ stopped , followUp ] = [ started [ 0 ] ! , started [ 1 ] ! ] ;
2038+ const providerSessionId = followUp . providerThread . providerSessionId ! ;
2039+ assert . equal (
2040+ yield * sessions . isLive ( stopped . providerThread . providerSessionId ! ) ,
2041+ ! switchesInstance ,
2042+ "Force stop kept the stopped run's session for a follow-up on another instance" ,
2043+ ) ;
20152044 assert . isFalse (
20162045 interrupted . some ( ( interrupt ) =>
20172046 String ( interrupt . providerTurnId ) . includes ( followUp . attemptId ) ,
@@ -2029,7 +2058,7 @@ it.effect.each([
20292058 ) ;
20302059
20312060 // The first run's provider never confirms the stop; the follow-up's turn ends normally.
2032- yield * Queue . offer ( events , {
2061+ yield * Queue . offer ( eventQueues . get ( followUp . providerThread . providerInstanceId ) ! , {
20332062 type : "turn.terminal" ,
20342063 driver,
20352064 providerThreadId : followUp . providerThread . id ,
0 commit comments