@@ -2698,17 +2698,19 @@ export function makeOpenCodeAdapter(
26982698 ) ,
26992699 ) . pipe (
27002700 Effect . timeout ( "10 seconds" ) ,
2701- Effect . mapError ( ( cause ) => {
2702- if ( OpenCodeRuntimeError . is ( cause ) ) {
2703- return toRequestError ( cause ) ;
2704- }
2705- promptTimedOut = true ;
2706- return new ProviderAdapterRequestError ( {
2707- provider : PROVIDER ,
2708- method : "session.promptAsync" ,
2709- detail : "OpenCode prompt submission did not complete within 10 seconds." ,
2710- cause,
2711- } ) ;
2701+ Effect . catchTags ( {
2702+ OpenCodeRuntimeError : ( cause ) => Effect . fail ( toRequestError ( cause ) ) ,
2703+ TimeoutError : ( cause ) => {
2704+ promptTimedOut = true ;
2705+ return Effect . fail (
2706+ new ProviderAdapterRequestError ( {
2707+ provider : PROVIDER ,
2708+ method : "session.promptAsync" ,
2709+ detail : "OpenCode prompt submission did not complete within 10 seconds." ,
2710+ cause,
2711+ } ) ,
2712+ ) ;
2713+ } ,
27122714 } ) ,
27132715 Effect . tapError ( ( requestError ) =>
27142716 context . promptAdmission !== promptAdmission || context . activeTurnId !== turnId
@@ -2928,16 +2930,18 @@ export function makeOpenCodeAdapter(
29282930 context . client . session . abort ( { sessionID : context . openCodeSessionId } , { signal } ) ,
29292931 ) . pipe (
29302932 Effect . timeout ( "10 seconds" ) ,
2931- Effect . mapError ( ( cause ) =>
2932- OpenCodeRuntimeError . is ( cause )
2933- ? toRequestError ( cause )
2934- : new ProviderAdapterRequestError ( {
2933+ Effect . catchTags ( {
2934+ OpenCodeRuntimeError : ( cause ) => Effect . fail ( toRequestError ( cause ) ) ,
2935+ TimeoutError : ( cause ) =>
2936+ Effect . fail (
2937+ new ProviderAdapterRequestError ( {
29352938 provider : PROVIDER ,
29362939 method : "session.abort" ,
29372940 detail : "OpenCode session abort did not complete within 10 seconds." ,
29382941 cause,
29392942 } ) ,
2940- ) ,
2943+ ) ,
2944+ } ) ,
29412945 Effect . exit ,
29422946 Effect . map ( ( exit ) => ( { source : "request" as const , exit } ) ) ,
29432947 ) ,
0 commit comments