@@ -5149,109 +5149,77 @@ describe("PiAdapterV2", () => {
51495149 } ) . pipe ( Effect . scoped , Effect . provide ( layerTest ) ) ,
51505150 ) ;
51515151
5152- it . effect . each ( [ false , true ] ) (
5153- "completes recovered message errors after native continuation, compaction=%s" ,
5154- ( compact ) =>
5155- Effect . gen ( function * ( ) {
5156- const fake = yield * makeFakePi ;
5157- const { runtime, takeEvent } = yield * openRuntime ( fake ) ;
5158- const providerThread = yield * runtime . ensureThread ( {
5159- threadId : THREAD_ID ,
5160- modelSelection : modelSelection ( "default" ) ,
5161- runtimePolicy,
5162- } ) ;
5163- yield * startTurn ( runtime , providerThread ) ;
5164- yield * fake . takeRequest ( "prompt" ) ;
5165- yield * fake . emit ( { type : "agent_start" } ) ;
5166- yield * fake . emit ( {
5167- type : "message_end" ,
5168- message : {
5169- role : "assistant" ,
5170- content : [ ] ,
5171- stopReason : "error" ,
5172- errorMessage : "This operation was aborted" ,
5173- } ,
5174- } ) ;
5175- yield * fake . emit ( { type : "agent_end" , messages : [ ] , willRetry : false } ) ;
5176- if ( compact ) {
5177- yield * fake . emit ( { type : "compaction_start" , reason : "manual" } ) ;
5178- yield * fake . emit ( {
5179- type : "compaction_end" ,
5180- reason : "manual" ,
5181- result : { summary : "Recovered context" } ,
5182- aborted : false ,
5183- willRetry : false ,
5184- } ) ;
5185- }
5186- yield * fake . emit ( { type : "agent_start" } ) ;
5187- yield * fake . emit ( { type : "message_start" , message : { role : "assistant" } } ) ;
5188- yield * fake . emit ( {
5189- type : "message_update" ,
5190- assistantMessageEvent : { type : "text_end" , contentIndex : 0 , content : "Paused." } ,
5191- } ) ;
5192- yield * fake . emit ( {
5193- type : "message_end" ,
5194- message : {
5195- role : "assistant" ,
5196- content : [ { type : "text" , text : "Paused." } ] ,
5197- stopReason : "stop" ,
5198- } ,
5199- } ) ;
5200- yield * fake . emit ( { type : "agent_settled" , aborted : false } ) ;
5152+ it . effect ( "completes a turn whose message error Pi recovered from natively" , ( ) =>
5153+ Effect . gen ( function * ( ) {
5154+ const fake = yield * makeFakePi ;
5155+ const { runtime, takeEvent } = yield * openRuntime ( fake ) ;
5156+ const providerThread = yield * runtime . ensureThread ( {
5157+ threadId : THREAD_ID ,
5158+ modelSelection : modelSelection ( "default" ) ,
5159+ runtimePolicy,
5160+ } ) ;
5161+ yield * startTurn ( runtime , providerThread ) ;
5162+ yield * fake . takeRequest ( "prompt" ) ;
5163+ yield * fake . emit ( { type : "agent_start" } ) ;
5164+ yield * fake . emit ( {
5165+ type : "message_end" ,
5166+ message : {
5167+ role : "assistant" ,
5168+ content : [ ] ,
5169+ stopReason : "error" ,
5170+ errorMessage : "This operation was aborted" ,
5171+ } ,
5172+ } ) ;
5173+ yield * fake . emit ( { type : "agent_end" , messages : [ ] , willRetry : false } ) ;
5174+ yield * fake . emit ( { type : "agent_start" } ) ;
5175+ yield * fake . emit ( { type : "message_start" , message : { role : "assistant" } } ) ;
5176+ yield * fake . emit ( {
5177+ type : "message_update" ,
5178+ assistantMessageEvent : { type : "text_end" , contentIndex : 0 , content : "Paused." } ,
5179+ } ) ;
5180+ yield * fake . emit ( {
5181+ type : "message_end" ,
5182+ message : {
5183+ role : "assistant" ,
5184+ content : [ { type : "text" , text : "Paused." } ] ,
5185+ stopReason : "stop" ,
5186+ } ,
5187+ } ) ;
5188+ yield * fake . emit ( { type : "agent_settled" , aborted : false } ) ;
52015189
5202- const completedTurn = yield * takeEvent (
5203- ( event ) =>
5204- event . type === "provider_turn.updated" && event . providerTurn . completedAt !== null ,
5205- ) ;
5206- assert . isTrue (
5207- completedTurn . type === "provider_turn.updated" &&
5208- completedTurn . providerTurn . status === "completed" ,
5209- ) ;
5210- const session = yield * takeEvent ( ( event ) => event . type === "provider_session.updated" ) ;
5211- assert . isTrue (
5212- session . type === "provider_session.updated" &&
5213- session . providerSession . status === "ready" &&
5214- session . providerSession . lastError === null ,
5215- ) ;
5216- const terminal = yield * takeEvent ( ( event ) => event . type === "turn.terminal" ) ;
5217- assert . isTrue (
5218- terminal . type === "turn.terminal" &&
5219- terminal . status === "completed" &&
5220- terminal . failure === null ,
5221- ) ;
5222- } ) . pipe ( Effect . scoped , Effect . provide ( layerTest ) ) ,
5190+ const completedTurn = yield * takeEvent (
5191+ ( event ) =>
5192+ event . type === "provider_turn.updated" && event . providerTurn . completedAt !== null ,
5193+ ) ;
5194+ assert . isTrue (
5195+ completedTurn . type === "provider_turn.updated" &&
5196+ completedTurn . providerTurn . status === "completed" ,
5197+ ) ;
5198+ const session = yield * takeEvent ( ( event ) => event . type === "provider_session.updated" ) ;
5199+ assert . isTrue (
5200+ session . type === "provider_session.updated" &&
5201+ session . providerSession . status === "ready" &&
5202+ session . providerSession . lastError === null ,
5203+ ) ;
5204+ const terminal = yield * takeEvent ( ( event ) => event . type === "turn.terminal" ) ;
5205+ assert . isTrue (
5206+ terminal . type === "turn.terminal" &&
5207+ terminal . status === "completed" &&
5208+ terminal . failure === null ,
5209+ ) ;
5210+ } ) . pipe ( Effect . scoped , Effect . provide ( layerTest ) ) ,
52235211 ) ;
52245212
52255213 it . effect . each ( [
5226- {
5227- name : "unrecovered error" ,
5228- messages : [ ] ,
5229- exhausted : false ,
5230- aborted : false ,
5231- error : "original error" ,
5232- } ,
52335214 {
52345215 name : "unfinished continuation" ,
52355216 messages : [
52365217 { type : "agent_start" } ,
52375218 { type : "message_start" , message : { role : "assistant" } } ,
52385219 ] ,
52395220 exhausted : false ,
5240- aborted : false ,
52415221 error : "original error" ,
52425222 } ,
5243- {
5244- name : "later request error" ,
5245- messages : [
5246- {
5247- type : "message_end" ,
5248- message : { role : "assistant" , stopReason : "error" , errorMessage : "latest error" } ,
5249- } ,
5250- ] ,
5251- exhausted : false ,
5252- aborted : false ,
5253- error : "latest error" ,
5254- } ,
52555223 {
52565224 name : "failed request after a successful tool response" ,
52575225 messages : [
@@ -5262,7 +5230,6 @@ describe("PiAdapterV2", () => {
52625230 } ,
52635231 ] ,
52645232 exhausted : false ,
5265- aborted : false ,
52665233 error : "latest error" ,
52675234 } ,
52685235 {
@@ -5278,20 +5245,17 @@ describe("PiAdapterV2", () => {
52785245 } ,
52795246 ] ,
52805247 exhausted : false ,
5281- aborted : false ,
52825248 error : "original error" ,
52835249 } ,
52845250 {
52855251 name : "exhausted retry" ,
52865252 messages : [ { type : "message_end" , message : { role : "assistant" , stopReason : "stop" } } ] ,
52875253 exhausted : true ,
5288- aborted : false ,
52895254 error : "retry exhausted" ,
52905255 } ,
5291- { name : "native cancellation" , messages : [ ] , exhausted : false , aborted : true , error : null } ,
52925256 ] ) (
52935257 "preserves terminal semantics after a message error: $name" ,
5294- ( { messages, exhausted, aborted , error } ) =>
5258+ ( { messages, exhausted, error } ) =>
52955259 Effect . gen ( function * ( ) {
52965260 const fake = yield * makeFakePi ;
52975261 const { runtime, takeEvent } = yield * openRuntime ( fake ) ;
@@ -5316,12 +5280,12 @@ describe("PiAdapterV2", () => {
53165280 } ) ;
53175281 }
53185282 for ( const message of messages ) yield * fake . emit ( message ) ;
5319- yield * fake . emit ( { type : "agent_settled" , aborted } ) ;
5283+ yield * fake . emit ( { type : "agent_settled" , aborted : false } ) ;
53205284 const terminal = yield * takeEvent ( ( event ) => event . type === "turn.terminal" ) ;
53215285 assert . isTrue ( terminal . type === "turn.terminal" ) ;
53225286 if ( terminal . type !== "turn.terminal" ) return ;
5323- assert . equal ( terminal . status , aborted ? "interrupted" : "failed" ) ;
5324- assert . equal ( terminal . failure ?. message ?? null , error ) ;
5287+ assert . equal ( terminal . status , "failed" ) ;
5288+ assert . equal ( terminal . failure ?. message , error ) ;
53255289 } ) . pipe ( Effect . scoped , Effect . provide ( layerTest ) ) ,
53265290 ) ;
53275291
0 commit comments