@@ -2386,39 +2386,88 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
23862386 event . type === "turn_item.updated" ? [ `${ event . turnItem . type } :${ event . turnItem . status } ` ] : [ ] ,
23872387 ) ;
23882388
2389- it . effect ( "recovers a steer's missed delivery from history after reconnect" , ( ) =>
2390- Effect . gen ( function * ( ) {
2391- const steerId = `msg_t3_steer_${ SESSION } :message:opencode2-adapter:steer` ;
2392- const { runtime, thread } = yield * resumed ( [
2393- out ( "session.prompt" , { sessionID : SESSION , id : PROMPT_ID , text : "<any>" } ) ,
2394- promptAccepted ,
2395- out ( "session.prompt" , "<any>" ) ,
2396- replyData ( "session.prompt" , {
2397- id : steerId ,
2398- sessionID : SESSION ,
2399- time : { created : 2 } ,
2400- type : "user" ,
2401- payload : { text : "steered" } ,
2402- delivery : "steer" ,
2403- } ) ,
2404- ...reconnected ( { } , "succeeded" , { } , steerId ) ,
2405- event ( "session.execution.interrupted" , { sessionID : SESSION , reason : "user" } ) ,
2406- ] ) ;
2407- const terminal = yield * terminalOf ( runtime ) . pipe ( Effect . forkScoped ) ;
2408- yield * runtime . startTurn ( turnInput ( thread ) ) ;
2409- yield * runtime . steerTurn ( {
2410- providerThread : thread ,
2411- providerTurnId : yield * providerTurnId ,
2412- threadId,
2413- runId : turnInput ( thread ) . runId ,
2414- message : {
2415- ...turnInput ( thread ) . message ,
2416- messageId : MessageId . make ( "message:opencode2-adapter:steer" ) ,
2417- text : "steered" ,
2418- } ,
2419- } ) ;
2420- assert . equal ( ( yield * Fiber . join ( terminal ) ) ?. status , "completed" ) ;
2421- } ) . pipe ( Effect . scoped ) ,
2389+ it . effect . each ( [ "delivered" , "pending" ] as const ) (
2390+ "reconciles a %s steer after reconnect without losing its execution" ,
2391+ ( delivery ) =>
2392+ Effect . gen ( function * ( ) {
2393+ const steerId = `msg_t3_steer_${ SESSION } :message:opencode2-adapter:steer` ;
2394+ const reconnect = reconnected (
2395+ { } ,
2396+ "succeeded" ,
2397+ { } ,
2398+ delivery === "delivered" ? steerId : undefined ,
2399+ ) ;
2400+ const { runtime, thread } = yield * resumed (
2401+ [
2402+ out ( "session.prompt" , { sessionID : SESSION , id : PROMPT_ID , text : "<any>" } ) ,
2403+ promptAccepted ,
2404+ ...( delivery === "pending"
2405+ ? [
2406+ event ( "rpc.opencode.goal.changed" , {
2407+ sessionID : SESSION ,
2408+ goal : nativeGoal ( "active" ) ,
2409+ } ) ,
2410+ ]
2411+ : [ ] ) ,
2412+ out ( "session.prompt" , "<any>" ) ,
2413+ replyData ( "session.prompt" , {
2414+ id : steerId ,
2415+ sessionID : SESSION ,
2416+ time : { created : 2 } ,
2417+ type : "user" ,
2418+ payload : { text : "steered" } ,
2419+ delivery : "steer" ,
2420+ } ) ,
2421+ ...reconnect . slice ( 0 , 2 ) ,
2422+ ...( delivery === "pending"
2423+ ? [ out ( "rpc.call" , "<any>" ) , reply ( "rpc.call" , { output : { unreadable : true } } ) ]
2424+ : [ ] ) ,
2425+ ...reconnect . slice ( 2 ) ,
2426+ ...( delivery === "pending"
2427+ ? [
2428+ event ( "session.execution.started" , { sessionID : SESSION } ) ,
2429+ event ( "session.inbox.delivered" , { sessionID : SESSION , inboxID : steerId } ) ,
2430+ event ( "session.text.ended" , {
2431+ sessionID : SESSION ,
2432+ assistantMessageID : "msg_delayed_steer" ,
2433+ ordinal : 0 ,
2434+ text : "Steer processed" ,
2435+ } ) ,
2436+ event ( "session.execution.succeeded" , { sessionID : SESSION } ) ,
2437+ ]
2438+ : [ event ( "session.execution.interrupted" , { sessionID : SESSION , reason : "user" } ) ] ) ,
2439+ ] ,
2440+ delivery === "pending" ? { version : "2.2.5" } : undefined ,
2441+ ) ;
2442+ const events = yield * runtime . events . pipe (
2443+ Stream . takeUntil ( ( e ) => e . type === "turn.terminal" ) ,
2444+ Stream . runCollect ,
2445+ Effect . forkScoped ,
2446+ ) ;
2447+ yield * runtime . startTurn ( turnInput ( thread ) ) ;
2448+ yield * runtime . steerTurn ( {
2449+ providerThread : thread ,
2450+ providerTurnId : yield * providerTurnId ,
2451+ threadId,
2452+ runId : turnInput ( thread ) . runId ,
2453+ message : {
2454+ ...turnInput ( thread ) . message ,
2455+ messageId : MessageId . make ( "message:opencode2-adapter:steer" ) ,
2456+ text : "steered" ,
2457+ } ,
2458+ } ) ;
2459+ const collected = yield * Fiber . join ( events ) ;
2460+ assert . deepInclude ( collected . at ( - 1 ) , { type : "turn.terminal" , status : "completed" } ) ;
2461+ if ( delivery === "pending" )
2462+ assert . isTrue (
2463+ collected . some (
2464+ ( e ) =>
2465+ e . type === "turn_item.updated" &&
2466+ e . turnItem . type === "assistant_message" &&
2467+ e . turnItem . text === "Steer processed" ,
2468+ ) ,
2469+ ) ;
2470+ } ) . pipe ( Effect . scoped ) ,
24222471 ) ;
24232472
24242473 it . effect ( "does not end a turn from an earlier turn's history when its prompt is not there" , ( ) =>
0 commit comments