@@ -15,20 +15,22 @@ import { Anthropic } from "@anthropic-ai/sdk"
1515import { type ModelInfo , geminiDefaultModelId , ApiProviderError } from "@roo-code/types"
1616
1717import { t } from "i18next"
18+ import type { ApiHandlerCreateMessageMetadata } from "../../index"
1819import { GeminiHandler } from "../gemini"
1920import { asyncStreamFrom , collectStream } from "../../../test-utils/stream"
2021
2122const GEMINI_MODEL_NAME = geminiDefaultModelId
2223
2324describe ( "GeminiHandler" , ( ) => {
2425 let handler : GeminiHandler
26+ let mockGenerateContentStream : ReturnType < typeof vitest . fn >
2527
2628 beforeEach ( ( ) => {
2729 // Reset mocks
2830 mockCaptureException . mockClear ( )
2931
3032 // Create mock functions
31- const mockGenerateContentStream = vitest . fn ( )
33+ mockGenerateContentStream = vitest . fn ( )
3234 const mockGenerateContent = vitest . fn ( )
3335 const mockGetGenerativeModel = vitest . fn ( )
3436
@@ -293,6 +295,43 @@ describe("GeminiHandler", () => {
293295 )
294296 } )
295297
298+ it ( "should keep an empty tool result as the final user turn" , async ( ) => {
299+ const messages : Anthropic . Messages . MessageParam [ ] = [
300+ { role : "user" , content : "Run the tool" } ,
301+ {
302+ role : "assistant" ,
303+ content : [ { type : "tool_use" , id : "call-1" , name : "read_file" , input : { path : "empty.txt" } } ] ,
304+ } ,
305+ {
306+ role : "user" ,
307+ content : [ { type : "tool_result" , tool_use_id : "call-1" , content : "" } ] ,
308+ } ,
309+ ]
310+ const metadata = {
311+ taskId : "test-task" ,
312+ tools : [ { type : "function" , function : { name : "read_file" , description : "" , parameters : { } } } ] ,
313+ } satisfies ApiHandlerCreateMessageMetadata
314+
315+ mockGenerateContentStream . mockResolvedValue (
316+ asyncStreamFrom ( [ { candidates : [ { content : { parts : [ { text : "Done" } ] } } ] } ] ) ,
317+ )
318+
319+ await collectStream ( handler . createMessage ( systemPrompt , messages , metadata ) )
320+
321+ const params = mockGenerateContentStream . mock . calls [ 0 ] [ 0 ]
322+ expect ( params . contents . at ( - 1 ) ) . toEqual ( {
323+ role : "user" ,
324+ parts : [
325+ {
326+ functionResponse : {
327+ name : "read_file" ,
328+ response : { name : "read_file" , content : "(empty)" } ,
329+ } ,
330+ } ,
331+ ] ,
332+ } )
333+ } )
334+
296335 it ( "should handle API errors" , async ( ) => {
297336 const mockError = new Error ( "Gemini API error" )
298337 ; ( handler [ "client" ] . models . generateContentStream as any ) . mockRejectedValue ( mockError )
0 commit comments