@@ -379,7 +379,14 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {
379379 if ( ! messageID ) {
380380 throw new Error ( "Expected messageID" ) ;
381381 }
382- runtimeMock . state . revertMessageID = messageID ;
382+ let lastUserID : string | undefined ;
383+ for ( const entry of runtimeMock . state . messages ) {
384+ if ( entry . info . role === "user" ) lastUserID = entry . info . id ;
385+ if ( entry . info . id === messageID && entry . parts . length > 0 ) {
386+ runtimeMock . state . revertMessageID = lastUserID ?? messageID ;
387+ break ;
388+ }
389+ }
383390 } ,
384391 } ,
385392 event : {
@@ -6324,13 +6331,15 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
63246331 } ) ;
63256332
63266333 runtimeMock . state . messages = [
6334+ { info : { id : "user-1" , role : "user" } , parts : [ ] } ,
63276335 {
63286336 info : { id : "assistant-1" , role : "assistant" } ,
6329- parts : [ ] ,
6337+ parts : [ { id : "part-1" , type : "text" , text : "first answer" } ] ,
63306338 } ,
6339+ { info : { id : "user-2" , role : "user" } , parts : [ ] } ,
63316340 {
63326341 info : { id : "assistant-2" , role : "assistant" } ,
6333- parts : [ ] ,
6342+ parts : [ { id : "part-2" , type : "text" , text : "second answer" } ] ,
63346343 } ,
63356344 ] ;
63366345
@@ -6364,6 +6373,15 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
63646373 runtimeMock . state . revertCalls . slice ( - 2 ) . map ( ( call ) => call . messageID ) ,
63656374 [ "assistant-2" , "assistant-1" ] ,
63666375 ) ;
6376+ runtimeMock . state . revertMessageID = undefined ;
6377+ runtimeMock . state . messages = runtimeMock . state . messages . filter (
6378+ ( entry ) => entry . info . id !== "user-2" ,
6379+ ) ;
6380+ const sharedUserSnapshot = yield * adapter . rollbackThread ( threadId , 1 ) ;
6381+ NodeAssert . equal ( runtimeMock . state . revertMessageID , "user-1" ) ;
6382+ NodeAssert . deepEqual ( sharedUserSnapshot . turns , [ ] ) ;
6383+ NodeAssert . deepEqual ( ( yield * adapter . readThread ( threadId ) ) . turns , [ ] ) ;
6384+
63676385 runtimeMock . state . messages = [ ] ;
63686386 runtimeMock . state . revertCalls . length = 0 ;
63696387 const emptySnapshot = yield * adapter . rollbackThread ( threadId , 1 ) ;
0 commit comments