fix: update RooHandler to accept RooMessage[] type

daniel-lxs · daniel-lxs · commit fef98f6f5e93 · 2026-02-10T22:30:06.000-05:00
diff --git a/src/api/providers/__tests__/roo.spec.ts b/src/api/providers/__tests__/roo.spec.ts
@@ -4,6 +4,7 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import { rooDefaultModelId } from "@roo-code/types"
 
 import { ApiHandlerOptions } from "../../../shared/api"
+import type { RooMessage } from "../../../core/task-persistence/rooMessage"
 
 // Mock the AI SDK
 const mockStreamText = vitest.fn()
@@ -138,7 +139,7 @@ describe("RooHandler", () => {
 	let handler: RooHandler
 	let mockOptions: ApiHandlerOptions
 	const systemPrompt = "You are a helpful assistant."
-	const messages: Anthropic.Messages.MessageParam[] = [
+	const messages: RooMessage[] = [
 		{
 			role: "user",
 			content: "Hello!",
@@ -297,7 +298,7 @@ describe("RooHandler", () => {
 		it("should handle multiple messages in conversation", async () => {
 			mockStreamText.mockReturnValue(createMockStreamResult())
 
-			const multipleMessages: Anthropic.Messages.MessageParam[] = [
+			const multipleMessages: RooMessage[] = [
 				{ role: "user", content: "First message" },
 				{ role: "assistant", content: "First response" },
 				{ role: "user", content: "Second message" },
diff --git a/src/api/providers/roo.ts b/src/api/providers/roo.ts
@@ -1,6 +1,6 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible"
-import { streamText, generateText } from "ai"
+import { streamText, generateText, type ModelMessage } from "ai"
 
 import { rooDefaultModelId, getApiProtocol, type ImageGenerationApiMethod } from "@roo-code/types"
 import { CloudService } from "@roo-code/cloud"
@@ -10,13 +10,7 @@ import type { ApiHandlerOptions } from "../../shared/api"
 import { calculateApiCostOpenAI } from "../../shared/cost"
 import { ApiStream } from "../transform/stream"
 import { getModelParams } from "../transform/model-params"
-import {
-	convertToAiSdkMessages,
-	convertToolsForAiSdk,
-	processAiSdkStreamPart,
-	handleAiSdkError,
-	mapToolChoice,
-} from "../transform/ai-sdk"
+import { convertToolsForAiSdk, processAiSdkStreamPart, handleAiSdkError, mapToolChoice } from "../transform/ai-sdk"
 import { type ReasoningDetail } from "../transform/openai-format"
 import type { RooReasoningParams } from "../transform/reasoning"
 import { getRooReasoning } from "../transform/reasoning"
@@ -26,6 +20,7 @@ import { BaseProvider } from "./base-provider"
 import { getModels, getModelsFromCache } from "./fetchers/modelCache"
 import { generateImageWithProvider, generateImageWithImagesApi, ImageGenerationResult } from "./utils/image-generation"
 import { t } from "../../i18n"
+import type { RooMessage } from "../../core/task-persistence/rooMessage"
 
 function getSessionToken(): string {
 	const token = CloudService.hasInstance() ? CloudService.instance.authService?.getSessionToken() : undefined
@@ -95,7 +90,7 @@ export class RooHandler extends BaseProvider implements SingleCompletionHandler
 
 	override async *createMessage(
 		systemPrompt: string,
-		messages: Anthropic.Messages.MessageParam[],
+		messages: RooMessage[],
 		metadata?: ApiHandlerCreateMessageMetadata,
 	): ApiStream {
 		// Reset reasoning_details accumulator for this request
@@ -127,8 +122,8 @@ export class RooHandler extends BaseProvider implements SingleCompletionHandler
 		// Create per-request provider with fresh session token
 		const provider = this.createRooProvider({ reasoning, taskId: metadata?.taskId })
 
-		// Convert messages and tools to AI SDK format
-		const aiSdkMessages = convertToAiSdkMessages(messages)
+		// RooMessage[] is already AI SDK-compatible, cast directly
+		const aiSdkMessages = messages as ModelMessage[]
 		const tools = convertToolsForAiSdk(this.convertToolsForOpenAI(metadata?.tools))
 
 		let accumulatedReasoningText = ""
