@@ -10,7 +10,7 @@ import type {
1010 SessionConfigSelectOption ,
1111 SetSessionConfigOptionResponse ,
1212} from "@agentclientprotocol/sdk"
13- import type { OpencodeClient } from "@opencode-ai/sdk/v2"
13+ import type { AssistantMessage , OpencodeClient } from "@opencode-ai/sdk/v2"
1414import { ProviderV2 } from "@opencode-ai/core/provider"
1515import { ModelV2 } from "@opencode-ai/core/model"
1616import { Effect } from "effect"
@@ -144,7 +144,10 @@ const provider: Provider.Info = {
144144describe ( "ACP service sessions" , ( ) => {
145145 const makeService = (
146146 messages : readonly { info : unknown ; parts : readonly unknown [ ] } [ ] = [ ] ,
147- options ?: { abort ?: ( input : { sessionID : string } ) => Promise < { data : boolean } > } ,
147+ options ?: {
148+ abort ?: ( input : { sessionID : string } ) => Promise < { data : boolean } >
149+ prompt ?: ( input : unknown ) => Promise < { data : { info : ReturnType < typeof assistantInfo > } } >
150+ } ,
148151 ) => {
149152 const updates : SessionNotification [ ] = [ ]
150153 const mcpAdds : string [ ] = [ ]
@@ -193,19 +196,21 @@ describe("ACP service sessions", () => {
193196 data : input . directory ? sessions . filter ( ( session ) => session . directory === input . directory ) : sessions ,
194197 } ) ,
195198 messages : ( ) => Promise . resolve ( { data : messages } ) ,
196- prompt : ( input : unknown ) => {
197- prompts . push ( input )
198- return Promise . resolve ( {
199- data : {
200- info : assistantInfo ( {
201- input : 100 ,
202- output : 40 ,
203- reasoning : 7 ,
204- cache : { read : 11 , write : 13 } ,
205- } ) ,
206- } ,
207- } )
208- } ,
199+ prompt :
200+ options ?. prompt ??
201+ ( ( input : unknown ) => {
202+ prompts . push ( input )
203+ return Promise . resolve ( {
204+ data : {
205+ info : assistantInfo ( {
206+ input : 100 ,
207+ output : 40 ,
208+ reasoning : 7 ,
209+ cache : { read : 11 , write : 13 } ,
210+ } ) ,
211+ } ,
212+ } )
213+ } ) ,
209214 command : ( input : unknown ) => {
210215 commands . push ( input )
211216 return Promise . resolve ( {
@@ -994,6 +999,52 @@ describe("ACP service sessions", () => {
994999 expect ( usageUpdates ) . toEqual ( [ session . sessionId ] )
9951000 } )
9961001
1002+ it ( "maps assistant prompt errors to request errors instead of end turn" , async ( ) => {
1003+ const { service } = makeService ( [ ] , {
1004+ prompt : ( ) =>
1005+ Promise . resolve ( {
1006+ data : {
1007+ info : assistantInfo (
1008+ { input : 8 , output : 0 , reasoning : 0 , cache : { read : 0 , write : 0 } } ,
1009+ { name : "APIError" , data : { message : "Provider request failed" , isRetryable : false } } ,
1010+ ) ,
1011+ } ,
1012+ } ) ,
1013+ } )
1014+ const session = await Effect . runPromise ( service . newSession ( { cwd : "/workspace" , mcpServers : [ ] } ) )
1015+
1016+ const error = await Effect . runPromise (
1017+ service
1018+ . prompt ( { sessionId : session . sessionId , prompt : [ { type : "text" , text : "hello" } ] } )
1019+ . pipe ( Effect . mapError ( ACPError . toRequestError ) , Effect . flip ) ,
1020+ )
1021+
1022+ expect ( error . code ) . toBe ( - 32603 )
1023+ expect ( error . message ) . toBe ( "Internal error: Provider request failed" )
1024+ expect ( error . data ) . toEqual ( { service : "session" , errorName : "APIError" } )
1025+ } )
1026+
1027+ it ( "maps aborted assistant prompt errors to cancelled" , async ( ) => {
1028+ const { service } = makeService ( [ ] , {
1029+ prompt : ( ) =>
1030+ Promise . resolve ( {
1031+ data : {
1032+ info : assistantInfo (
1033+ { input : 8 , output : 1 , reasoning : 0 , cache : { read : 0 , write : 0 } } ,
1034+ { name : "MessageAbortedError" , data : { message : "Aborted" } } ,
1035+ ) ,
1036+ } ,
1037+ } ) ,
1038+ } )
1039+ const session = await Effect . runPromise ( service . newSession ( { cwd : "/workspace" , mcpServers : [ ] } ) )
1040+
1041+ const result = await Effect . runPromise (
1042+ service . prompt ( { sessionId : session . sessionId , prompt : [ { type : "text" , text : "hello" } ] } ) ,
1043+ )
1044+
1045+ expect ( result . stopReason ) . toBe ( "cancelled" )
1046+ } )
1047+
9971048 it ( "prompt maps assistant and user audience annotations" , async ( ) => {
9981049 const { service, prompts } = makeService ( )
9991050 const session = await Effect . runPromise ( service . newSession ( { cwd : "/workspace" , mcpServers : [ ] } ) )
@@ -1145,13 +1196,17 @@ describe("ACP service sessions", () => {
11451196 } )
11461197} )
11471198
1148- function assistantInfo ( tokens : UsageService . AssistantTokenCost [ "tokens" ] ) : UsageService . AssistantMessage {
1199+ function assistantInfo (
1200+ tokens : UsageService . AssistantTokenCost [ "tokens" ] ,
1201+ error ?: AssistantMessage [ "error" ] ,
1202+ ) : UsageService . AssistantMessage & Pick < AssistantMessage , "error" > {
11491203 return {
11501204 role : "assistant" ,
11511205 providerID : "test" ,
11521206 modelID : "test-model" ,
11531207 cost : 0 ,
11541208 tokens,
1209+ ...( error ? { error } : { } ) ,
11551210 }
11561211}
11571212
0 commit comments