Revert "feat: wire RooMessage storage into Task.ts and all providers"

src/api/index.ts

@@ -3,8 +3,6 @@ import OpenAI from "openai"
 
 import { isRetiredProvider, type ProviderSettings, type ModelInfo } from "@roo-code/types"
 
-import type { RooMessage } from "../core/task-persistence/rooMessage"
-
 import { ApiStream } from "./transform/stream"
 
 import {
@@ -91,7 +89,11 @@ export interface ApiHandlerCreateMessageMetadata {
 }
 
 export interface ApiHandler {
-	createMessage(systemPrompt: string, messages: RooMessage[], metadata?: ApiHandlerCreateMessageMetadata): ApiStream
+	createMessage(
+		systemPrompt: string,
+		messages: Anthropic.Messages.MessageParam[],
+		metadata?: ApiHandlerCreateMessageMetadata,
+	): ApiStream
 
 	getModel(): { id: string; info: ModelInfo }
 

src/api/providers/__tests__/anthropic-vertex.spec.ts

@@ -1,4 +1,3 @@
-import type { RooMessage } from "../../../core/task-persistence/rooMessage"
 // npx vitest run src/api/providers/__tests__/anthropic-vertex.spec.ts
 
 import { AnthropicVertexHandler } from "../anthropic-vertex"
@@ -185,7 +184,7 @@ describe("AnthropicVertexHandler", () => {
 	})
 
 	describe("createMessage", () => {
-		const mockMessages: RooMessage[] = [
+		const mockMessages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: "Hello",
@@ -245,20 +244,15 @@ describe("AnthropicVertexHandler", () => {
 			)
 		})
 
-		it("should pass messages directly to streamText as ModelMessage[]", async () => {
+		it("should call convertToAiSdkMessages with the messages", async () => {
 			mockStreamText.mockReturnValue(createMockStreamResult([]))
 
 			const stream = handler.createMessage(systemPrompt, mockMessages)
 			for await (const _chunk of stream) {
 				// consume
 			}
 
-			// Messages are now already in ModelMessage format, passed directly to streamText
-			expect(mockStreamText).toHaveBeenCalledWith(
-				expect.objectContaining({
-					messages: mockMessages,
-				}),
-			)
+			expect(convertToAiSdkMessages).toHaveBeenCalledWith(mockMessages)
 		})
 
 		it("should pass tools through AI SDK conversion pipeline", async () => {

src/api/providers/__tests__/azure.spec.ts

@@ -1,4 +1,3 @@
-import type { RooMessage } from "../../../core/task-persistence/rooMessage"
 // Use vi.hoisted to define mock functions that can be referenced in hoisted vi.mock() calls
 const { mockStreamText, mockGenerateText, mockCreateAzure } = vi.hoisted(() => ({
 	mockStreamText: vi.fn(),
@@ -133,7 +132,7 @@ describe("AzureHandler", () => {
 
 	describe("createMessage", () => {
 		const systemPrompt = "You are a helpful assistant."
-		const messages: RooMessage[] = [
+		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: [
@@ -377,7 +376,7 @@ describe("AzureHandler", () => {
 
 	describe("tools", () => {
 		const systemPrompt = "You are a helpful assistant."
-		const messages: RooMessage[] = [
+		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: [{ type: "text" as const, text: "Use a tool" }],

src/api/providers/__tests__/base-provider.spec.ts

@@ -1,4 +1,3 @@
-import type { RooMessage } from "../../../core/task-persistence/rooMessage"
 import { Anthropic } from "@anthropic-ai/sdk"
 
 import type { ModelInfo } from "@roo-code/types"
@@ -8,7 +7,7 @@ import type { ApiStream } from "../../transform/stream"
 
 // Create a concrete implementation for testing
 class TestProvider extends BaseProvider {
-	createMessage(_systemPrompt: string, _messages: RooMessage[]): ApiStream {
+	createMessage(_systemPrompt: string, _messages: Anthropic.Messages.MessageParam[]): ApiStream {
 		throw new Error("Not implemented")
 	}
 

src/api/providers/__tests__/baseten.spec.ts

@@ -1,4 +1,3 @@
-import type { RooMessage } from "../../../core/task-persistence/rooMessage"
 // npx vitest run src/api/providers/__tests__/baseten.spec.ts
 
 // Use vi.hoisted to define mock functions that can be referenced in hoisted vi.mock() calls
@@ -102,7 +101,7 @@ describe("BasetenHandler", () => {
 
 	describe("createMessage", () => {
 		const systemPrompt = "You are a helpful assistant."
-		const messages: RooMessage[] = [
+		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: [
@@ -282,7 +281,7 @@ describe("BasetenHandler", () => {
 
 	describe("tool handling", () => {
 		const systemPrompt = "You are a helpful assistant."
-		const messages: RooMessage[] = [
+		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: [{ type: "text" as const, text: "Hello!" }],
@@ -390,7 +389,7 @@ describe("BasetenHandler", () => {
 
 	describe("error handling", () => {
 		const systemPrompt = "You are a helpful assistant."
-		const messages: RooMessage[] = [
+		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: [{ type: "text" as const, text: "Hello!" }],

src/api/providers/__tests__/bedrock.spec.ts

@@ -1,4 +1,3 @@
-import type { RooMessage } from "../../../core/task-persistence/rooMessage"
 // Mock TelemetryService before other imports
 const mockCaptureException = vi.fn()
 
@@ -491,14 +490,17 @@ describe("AwsBedrockHandler", () => {
 		it("should properly pass image content through to streamText via AI SDK messages", async () => {
 			setupMockStreamText()
 
-			const messages: any[] = [
+			const messages: Anthropic.Messages.MessageParam[] = [
 				{
 					role: "user",
 					content: [
 						{
 							type: "image",
-							image: `data:image/jpeg;base64,${mockImageData}`,
-							mimeType: "image/jpeg",
+							source: {
+								type: "base64",
+								data: mockImageData,
+								media_type: "image/jpeg",
+							},
 						},
 						{
 							type: "text",
@@ -528,7 +530,7 @@ describe("AwsBedrockHandler", () => {
 			expect(userMsg).toBeDefined()
 			expect(Array.isArray(userMsg.content)).toBe(true)
 
-			// Messages are already in AI SDK ImagePart format
+			// The AI SDK convertToAiSdkMessages converts images to { type: "image", image: "data:...", mimeType: "..." }
 			const imagePart = userMsg.content.find((p: { type: string }) => p.type === "image")
 			expect(imagePart).toBeDefined()
 			expect(imagePart.image).toContain("data:image/jpeg;base64,")
@@ -542,23 +544,29 @@ describe("AwsBedrockHandler", () => {
 		it("should handle multiple images in a single message", async () => {
 			setupMockStreamText()
 
-			const messages: any[] = [
+			const messages: Anthropic.Messages.MessageParam[] = [
 				{
 					role: "user",
 					content: [
 						{
 							type: "image",
-							image: `data:image/jpeg;base64,${mockImageData}`,
-							mimeType: "image/jpeg",
+							source: {
+								type: "base64",
+								data: mockImageData,
+								media_type: "image/jpeg",
+							},
 						},
 						{
 							type: "text",
 							text: "First image",
 						},
 						{
 							type: "image",
-							image: `data:image/png;base64,${mockImageData}`,
-							mimeType: "image/png",
+							source: {
+								type: "base64",
+								data: mockImageData,
+								media_type: "image/png",
+							},
 						},
 						{
 							type: "text",
@@ -753,7 +761,7 @@ describe("AwsBedrockHandler", () => {
 				awsBedrock1MContext: true,
 			})
 
-			const messages: RooMessage[] = [
+			const messages: Anthropic.Messages.MessageParam[] = [
 				{
 					role: "user",
 					content: "Test message",
@@ -786,7 +794,7 @@ describe("AwsBedrockHandler", () => {
 				awsBedrock1MContext: false,
 			})
 
-			const messages: RooMessage[] = [
+			const messages: Anthropic.Messages.MessageParam[] = [
 				{
 					role: "user",
 					content: "Test message",
@@ -820,7 +828,7 @@ describe("AwsBedrockHandler", () => {
 				awsBedrock1MContext: true,
 			})
 
-			const messages: RooMessage[] = [
+			const messages: Anthropic.Messages.MessageParam[] = [
 				{
 					role: "user",
 					content: "Test message",
@@ -873,7 +881,7 @@ describe("AwsBedrockHandler", () => {
 				awsBedrock1MContext: true,
 			})
 
-			const messages: RooMessage[] = [
+			const messages: Anthropic.Messages.MessageParam[] = [
 				{
 					role: "user",
 					content: "Test message",
@@ -1005,7 +1013,7 @@ describe("AwsBedrockHandler", () => {
 					awsBedrockServiceTier: "PRIORITY",
 				})
 
-				const messages: RooMessage[] = [
+				const messages: Anthropic.Messages.MessageParam[] = [
 					{
 						role: "user",
 						content: "Test message",
@@ -1042,7 +1050,7 @@ describe("AwsBedrockHandler", () => {
 					awsBedrockServiceTier: "FLEX",
 				})
 
-				const messages: RooMessage[] = [
+				const messages: Anthropic.Messages.MessageParam[] = [
 					{
 						role: "user",
 						content: "Test message",
@@ -1079,7 +1087,7 @@ describe("AwsBedrockHandler", () => {
 					awsBedrockServiceTier: "PRIORITY", // Try to apply PRIORITY tier
 				})
 
-				const messages: RooMessage[] = [
+				const messages: Anthropic.Messages.MessageParam[] = [
 					{
 						role: "user",
 						content: "Test message",
@@ -1114,7 +1122,7 @@ describe("AwsBedrockHandler", () => {
 					// No awsBedrockServiceTier specified
 				})
 
-				const messages: RooMessage[] = [
+				const messages: Anthropic.Messages.MessageParam[] = [
 					{
 						role: "user",
 						content: "Test message",
@@ -1184,7 +1192,7 @@ describe("AwsBedrockHandler", () => {
 				awsRegion: "us-east-1",
 			})
 
-			const messages: RooMessage[] = [
+			const messages: Anthropic.Messages.MessageParam[] = [
 				{
 					role: "user",
 					content: "Hello",
@@ -1259,7 +1267,7 @@ describe("AwsBedrockHandler", () => {
 				awsRegion: "us-east-1",
 			})
 
-			const messages: RooMessage[] = [
+			const messages: Anthropic.Messages.MessageParam[] = [
 				{
 					role: "user",
 					content: "Hello",

src/api/providers/__tests__/deepseek.spec.ts

@@ -1,4 +1,3 @@
-import type { RooMessage } from "../../../core/task-persistence/rooMessage"
 // Use vi.hoisted to define mock functions that can be referenced in hoisted vi.mock() calls
 const { mockStreamText, mockGenerateText } = vi.hoisted(() => ({
 	mockStreamText: vi.fn(),
@@ -174,7 +173,7 @@ describe("DeepSeekHandler", () => {
 
 	describe("createMessage", () => {
 		const systemPrompt = "You are a helpful assistant."
-		const messages: RooMessage[] = [
+		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: [
@@ -401,7 +400,7 @@ describe("DeepSeekHandler", () => {
 
 	describe("reasoning content with deepseek-reasoner", () => {
 		const systemPrompt = "You are a helpful assistant."
-		const messages: RooMessage[] = [
+		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: [
@@ -571,7 +570,7 @@ describe("DeepSeekHandler", () => {
 
 	describe("tool handling", () => {
 		const systemPrompt = "You are a helpful assistant."
-		const messages: RooMessage[] = [
+		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: [{ type: "text" as const, text: "Hello!" }],

src/api/providers/__tests__/fireworks.spec.ts

@@ -1,4 +1,3 @@
-import type { RooMessage } from "../../../core/task-persistence/rooMessage"
 // npx vitest run src/api/providers/__tests__/fireworks.spec.ts
 
 // Use vi.hoisted to define mock functions that can be referenced in hoisted vi.mock() calls
@@ -364,7 +363,7 @@ describe("FireworksHandler", () => {
 
 	describe("createMessage", () => {
 		const systemPrompt = "You are a helpful assistant."
-		const messages: RooMessage[] = [
+		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: [
@@ -731,7 +730,7 @@ describe("FireworksHandler", () => {
 
 	describe("tool handling", () => {
 		const systemPrompt = "You are a helpful assistant."
-		const messages: RooMessage[] = [
+		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: [{ type: "text" as const, text: "Hello!" }],

src/api/providers/__tests__/gemini.spec.ts

@@ -1,4 +1,3 @@
-import type { RooMessage } from "../../../core/task-persistence/rooMessage"
 // npx vitest run src/api/providers/__tests__/gemini.spec.ts
 
 import { NoOutputGeneratedError } from "ai"
@@ -103,7 +102,7 @@ describe("GeminiHandler", () => {
 	})
 
 	describe("createMessage", () => {
-		const mockMessages: RooMessage[] = [
+		const mockMessages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: "Hello",
@@ -378,7 +377,7 @@ describe("GeminiHandler", () => {
 	})
 
 	describe("error telemetry", () => {
-		const mockMessages: RooMessage[] = [
+		const mockMessages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: "Hello",

src/api/providers/__tests__/lite-llm.spec.ts

@@ -1,4 +1,3 @@
-import type { RooMessage } from "../../../core/task-persistence/rooMessage"
 const { mockStreamText, mockGenerateText } = vi.hoisted(() => ({
 	mockStreamText: vi.fn(),
 	mockGenerateText: vi.fn(),
@@ -258,7 +257,7 @@ describe("LiteLLMHandler", () => {
 			})
 
 			const systemPrompt = "You are a helpful assistant"
-			const messages: RooMessage[] = [{ role: "user", content: "Hello" }]
+			const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Hello" }]
 
 			const generator = handler.createMessage(systemPrompt, messages)
 			for await (const _chunk of generator) {

src/api/providers/__tests__/lmstudio.spec.ts

@@ -1,4 +1,3 @@
-import type { RooMessage } from "../../../core/task-persistence/rooMessage"
 // Use vi.hoisted to define mock functions that can be referenced in hoisted vi.mock() calls
 const { mockStreamText, mockGenerateText, mockWrapLanguageModel } = vi.hoisted(() => ({
 	mockStreamText: vi.fn(),
@@ -61,7 +60,7 @@ describe("LmStudioHandler", () => {
 
 	describe("createMessage", () => {
 		const systemPrompt = "You are a helpful assistant."
-		const messages: RooMessage[] = [
+		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
 				content: "Hello!",