@@ -65,6 +65,7 @@ const runtimeMock = {
6565 revertCalls : [ ] as Array < { sessionID : string ; messageID ?: string } > ,
6666 promptCalls : [ ] as Array < unknown > ,
6767 promptAsyncError : null as Error | null ,
68+ abortError : null as Error | null ,
6869 closeError : null as Error | null ,
6970 messages : [ ] as MessageEntry [ ] ,
7071 subscribedEvents : [ ] as unknown [ ] ,
@@ -85,6 +86,7 @@ const runtimeMock = {
8586 this . state . revertCalls . length = 0 ;
8687 this . state . promptCalls . length = 0 ;
8788 this . state . promptAsyncError = null ;
89+ this . state . abortError = null ;
8890 this . state . closeError = null ;
8991 this . state . messages = [ ] ;
9092 this . state . subscribedEvents = [ ] ;
@@ -176,6 +178,9 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {
176178 } ,
177179 abort : async ( { sessionID } : { sessionID : string } ) => {
178180 runtimeMock . state . abortCalls . push ( sessionID ) ;
181+ if ( runtimeMock . state . abortError ) {
182+ throw runtimeMock . state . abortError ;
183+ }
179184 } ,
180185 promptAsync : async ( input : unknown ) => {
181186 runtimeMock . state . promptCalls . push ( input ) ;
@@ -809,6 +814,64 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
809814 } ) ,
810815 ) ;
811816
817+ it . effect ( "settles an interrupt before a remote abort failure can block it" , ( ) =>
818+ Effect . gen ( function * ( ) {
819+ const adapter = yield * OpenCodeAdapter ;
820+ const threadId = asThreadId ( "thread-interrupt-failure" ) ;
821+ yield * adapter . startSession ( {
822+ provider : ProviderDriverKind . make ( "opencode" ) ,
823+ threadId,
824+ runtimeMode : "full-access" ,
825+ } ) ;
826+
827+ const turn = yield * adapter . sendTurn ( {
828+ threadId,
829+ input : "stop this turn" ,
830+ modelSelection : {
831+ instanceId : ProviderInstanceId . make ( "opencode" ) ,
832+ model : "openai/gpt-5" ,
833+ } ,
834+ } ) ;
835+
836+ runtimeMock . state . abortError = new Error ( "abort request failed" ) ;
837+ yield * adapter . interruptTurn ( threadId , turn . turnId ) ;
838+
839+ const session = ( yield * adapter . listSessions ( ) ) . find ( ( entry ) => entry . threadId === threadId ) ;
840+ NodeAssert . equal ( session ?. status , "ready" ) ;
841+ NodeAssert . equal ( session ?. activeTurnId , undefined ) ;
842+ } ) ,
843+ ) ;
844+
845+ it . effect ( "keeps an interrupted OpenCode session ready after its abort event" , ( ) =>
846+ Effect . gen ( function * ( ) {
847+ const adapter = yield * OpenCodeAdapter ;
848+ const threadId = asThreadId ( "thread-interrupt-abort-event" ) ;
849+ runtimeMock . state . subscribedEvents = [
850+ {
851+ type : "session.error" ,
852+ properties : {
853+ sessionID : "http://127.0.0.1:9999/session" ,
854+ error : {
855+ name : "MessageAbortedError" ,
856+ data : { message : "Aborted" } ,
857+ } ,
858+ } ,
859+ } ,
860+ ] ;
861+
862+ yield * adapter . startSession ( {
863+ provider : ProviderDriverKind . make ( "opencode" ) ,
864+ threadId,
865+ runtimeMode : "full-access" ,
866+ } ) ;
867+ yield * advanceTestClock ( 10 ) ;
868+
869+ const session = ( yield * adapter . listSessions ( ) ) . find ( ( entry ) => entry . threadId === threadId ) ;
870+ NodeAssert . equal ( session ?. status , "ready" ) ;
871+ NodeAssert . equal ( session ?. lastError , undefined ) ;
872+ } ) ,
873+ ) ;
874+
812875 it . effect ( "passes agent and variant options for the adapter's bound custom instance id" , ( ) => {
813876 const instanceId = ProviderInstanceId . make ( "opencode_zen" ) ;
814877 const adapterLayer = Layer . effect (
0 commit comments