@@ -5672,6 +5672,78 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
56725672 } ) . pipe ( Effect . scoped ) ,
56735673 ) ;
56745674
5675+ // regression: #24549 a Stop whose interrupted event never arrives blocked the next fork
5676+ it . effect ( "forks a stopped session whose interrupted event never arrived" , ( ) =>
5677+ Effect . gen ( function * ( ) {
5678+ const FORK = "ses_f1484db83ffeLGtrRCFimo1H0e" ;
5679+ const { runtime, thread } = yield * resumed ( [
5680+ out ( "session.prompt" , { sessionID : SESSION , text : "<any>" } ) ,
5681+ promptAccepted ,
5682+ event ( "session.execution.started" , { sessionID : SESSION } ) ,
5683+ out ( "session.interrupt" , { sessionID : SESSION } ) ,
5684+ reply ( "session.interrupt" , { interrupted : true } ) ,
5685+ out ( "session.active" ) ,
5686+ reply ( "session.active" , { data : { } } ) ,
5687+ out ( "session.fork" , { sessionID : SESSION } ) ,
5688+ replyData ( "session.fork" , sessionInfo ( { id : FORK } ) ) ,
5689+ out ( "session.update" , { sessionID : FORK , permissions : "<any>" } ) ,
5690+ reply ( "session.update" , null ) ,
5691+ out ( "session.active" ) ,
5692+ reply ( "session.active" , { data : { } } ) ,
5693+ out ( "session.prompt" , { sessionID : SESSION , text : "<any>" } ) ,
5694+ promptAccepted ,
5695+ event ( "session.execution.interrupted" , { sessionID : SESSION } ) ,
5696+ event ( "session.execution.started" , { sessionID : SESSION } ) ,
5697+ event ( "session.execution.failed" , {
5698+ sessionID : SESSION ,
5699+ error : { type : "provider" , message : "second turn failed" } ,
5700+ } ) ,
5701+ ] ) ;
5702+ const ended = yield * terminals ( runtime , 2 ) ;
5703+ yield * runtime . startTurn ( turnInput ( thread ) ) ;
5704+ yield * runtime . interruptTurn ( {
5705+ providerThread : thread ,
5706+ providerTurnId : yield * providerTurnId ,
5707+ } ) ;
5708+ const forked = yield * runtime . forkThread ( {
5709+ sourceProviderThread : thread ,
5710+ targetThreadId : ThreadId . make ( "thread:opencode2-adapter:fork" ) ,
5711+ } ) ;
5712+ assert . equal ( forked . nativeThreadRef ?. nativeId , FORK ) ;
5713+ // The lost end arriving late must not finish the source's next turn.
5714+ yield * runtime . startTurn ( secondTurn ( thread ) ) ;
5715+ const [ first , second ] = yield * Fiber . join ( ended ) ;
5716+ assert . equal ( first ?. status , "interrupted" ) ;
5717+ assert . equal ( second ?. failure ?. message , "second turn failed" ) ;
5718+ } ) . pipe ( Effect . scoped ) ,
5719+ ) ;
5720+
5721+ it . effect ( "refuses to fork a stopped session OpenCode still runs" , ( ) =>
5722+ Effect . gen ( function * ( ) {
5723+ const { runtime, thread } = yield * resumed ( [
5724+ out ( "session.prompt" , { sessionID : SESSION , text : "<any>" } ) ,
5725+ promptAccepted ,
5726+ event ( "session.execution.started" , { sessionID : SESSION } ) ,
5727+ out ( "session.interrupt" , { sessionID : SESSION } ) ,
5728+ reply ( "session.interrupt" , { interrupted : true } ) ,
5729+ out ( "session.active" ) ,
5730+ reply ( "session.active" , { data : { [ SESSION ] : { type : "running" } } } ) ,
5731+ ] ) ;
5732+ yield * runtime . startTurn ( turnInput ( thread ) ) ;
5733+ yield * runtime . interruptTurn ( {
5734+ providerThread : thread ,
5735+ providerTurnId : yield * providerTurnId ,
5736+ } ) ;
5737+ const refused = yield * runtime
5738+ . forkThread ( {
5739+ sourceProviderThread : thread ,
5740+ targetThreadId : ThreadId . make ( "thread:opencode2-adapter:fork" ) ,
5741+ } )
5742+ . pipe ( Effect . flip ) ;
5743+ assert . equal ( refused . _tag , "ProviderAdapterProtocolError" ) ;
5744+ } ) . pipe ( Effect . scoped ) ,
5745+ ) ;
5746+
56755747 it . effect ( "moves a fork into its target thread's worktree before the first prompt" , ( ) =>
56765748 Effect . gen ( function * ( ) {
56775749 const FORK = "ses_f1484db83ffeLGtrRCFimo1H0e" ;
0 commit comments