Merge pull request #14 from RooVetGit/main

updating from main.

Author: richardwhiteii

.changeset/clever-news-arrive.md

@@ -1,5 +1,13 @@
 # Roo Code Changelog
 
+## [3.3.20]
+
+- Support project-specific custom modes in a .roomodes file
+- Add more Mistral models (thanks @d-oit and @bramburn!)
+- By popular request, make it so Ask mode can't write to Markdown files and is purely for chatting with
+- Add a setting to control the number of open editor tabs to tell the model about (665 is probably too many!)
+- Fix race condition bug with entering API key on the welcome screen
+
 ## [3.3.19]
 
 - Fix a bug where aborting in the middle of file writes would not revert the write

CHANGELOG.md

@@ -15,6 +15,8 @@
 <a href="https://marketplace.visualstudio.com/items?itemName=RooVeterinaryInc.roo-cline" target="_blank"><img src="https://img.shields.io/badge/Download%20on%20VS%20Marketplace-blue?style=for-the-badge&logo=visualstudiocode&logoColor=white" alt="Download on VS Marketplace"></a>
 <a href="https://github.com/RooVetGit/Roo-Code/discussions/categories/feature-requests?discussions_q=is%3Aopen+category%3A%22Feature+Requests%22+sort%3Atop" target="_blank"><img src="https://img.shields.io/badge/Feature%20Requests-yellow?style=for-the-badge" alt="Feature Requests"></a>
 <a href="https://marketplace.visualstudio.com/items?itemName=RooVeterinaryInc.roo-cline&ssr=false#review-details" target="_blank"><img src="https://img.shields.io/badge/Rate%20%26%20Review-green?style=for-the-badge" alt="Rate & Review"></a>
+<a href="https://docs.roocode.com" target="_blank"><img src="https://img.shields.io/badge/Documentation-6B46C1?style=for-the-badge&logo=readthedocs&logoColor=white" alt="Documentation"></a>
+
 </div>
 
 **Roo Code** is an AI-powered **autonomous coding agent** that lives in your editor. It can:

README.md

@@ -1,9 +1,9 @@
 {
 	"name": "roo-cline",
 	"displayName": "Roo Code (prev. Roo Cline)",
-	"description": "A VS Code plugin that enhances coding with AI-powered automation, multi-model support, and experimental features.",
+	"description": "An AI-powered autonomous coding agent that lives in your editor.",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.3.19",
+	"version": "3.3.20",
 	"icon": "assets/icons/rocket.png",
 	"galleryBanner": {
 		"color": "#617A91",

package-lock.json

@@ -4,3 +4,10 @@ module.exports = async function getFolderSize() {
 		errors: [],
 	}
 }
+
+module.exports.loose = async function getFolderSizeLoose() {
+	return {
+		size: 1000,
+		errors: [],
+	}
+}

package.json

@@ -0,0 +1,126 @@
+import { MistralHandler } from "../mistral"
+import { ApiHandlerOptions, mistralDefaultModelId } from "../../../shared/api"
+import { Anthropic } from "@anthropic-ai/sdk"
+import { ApiStreamTextChunk } from "../../transform/stream"
+
+// Mock Mistral client
+const mockCreate = jest.fn()
+jest.mock("@mistralai/mistralai", () => {
+	return {
+		Mistral: jest.fn().mockImplementation(() => ({
+			chat: {
+				stream: mockCreate.mockImplementation(async (options) => {
+					const stream = {
+						[Symbol.asyncIterator]: async function* () {
+							yield {
+								data: {
+									choices: [
+										{
+											delta: { content: "Test response" },
+											index: 0,
+										},
+									],
+								},
+							}
+						},
+					}
+					return stream
+				}),
+			},
+		})),
+	}
+})
+
+describe("MistralHandler", () => {
+	let handler: MistralHandler
+	let mockOptions: ApiHandlerOptions
+
+	beforeEach(() => {
+		mockOptions = {
+			apiModelId: "codestral-latest", // Update to match the actual model ID
+			mistralApiKey: "test-api-key",
+			includeMaxTokens: true,
+			modelTemperature: 0,
+		}
+		handler = new MistralHandler(mockOptions)
+		mockCreate.mockClear()
+	})
+
+	describe("constructor", () => {
+		it("should initialize with provided options", () => {
+			expect(handler).toBeInstanceOf(MistralHandler)
+			expect(handler.getModel().id).toBe(mockOptions.apiModelId)
+		})
+
+		it("should throw error if API key is missing", () => {
+			expect(() => {
+				new MistralHandler({
+					...mockOptions,
+					mistralApiKey: undefined,
+				})
+			}).toThrow("Mistral API key is required")
+		})
+
+		it("should use custom base URL if provided", () => {
+			const customBaseUrl = "https://custom.mistral.ai/v1"
+			const handlerWithCustomUrl = new MistralHandler({
+				...mockOptions,
+				mistralCodestralUrl: customBaseUrl,
+			})
+			expect(handlerWithCustomUrl).toBeInstanceOf(MistralHandler)
+		})
+	})
+
+	describe("getModel", () => {
+		it("should return correct model info", () => {
+			const model = handler.getModel()
+			expect(model.id).toBe(mockOptions.apiModelId)
+			expect(model.info).toBeDefined()
+			expect(model.info.supportsPromptCache).toBe(false)
+		})
+	})
+
+	describe("createMessage", () => {
+		const systemPrompt = "You are a helpful assistant."
+		const messages: Anthropic.Messages.MessageParam[] = [
+			{
+				role: "user",
+				content: [{ type: "text", text: "Hello!" }],
+			},
+		]
+
+		it("should create message successfully", async () => {
+			const iterator = handler.createMessage(systemPrompt, messages)
+			const result = await iterator.next()
+
+			expect(mockCreate).toHaveBeenCalledWith({
+				model: mockOptions.apiModelId,
+				messages: expect.any(Array),
+				maxTokens: expect.any(Number),
+				temperature: 0,
+			})
+
+			expect(result.value).toBeDefined()
+			expect(result.done).toBe(false)
+		})
+
+		it("should handle streaming response correctly", async () => {
+			const iterator = handler.createMessage(systemPrompt, messages)
+			const results: ApiStreamTextChunk[] = []
+
+			for await (const chunk of iterator) {
+				if ("text" in chunk) {
+					results.push(chunk as ApiStreamTextChunk)
+				}
+			}
+
+			expect(results.length).toBeGreaterThan(0)
+			expect(results[0].text).toBe("Test response")
+		})
+
+		it("should handle errors gracefully", async () => {
+			mockCreate.mockRejectedValueOnce(new Error("API Error"))
+			await expect(handler.createMessage(systemPrompt, messages).next()).rejects.toThrow("API Error")
+		})
+	})
+})

src/__mocks__/get-folder-size.js

@@ -130,11 +130,20 @@ describe("OpenAiNativeHandler", () => {
 			})
 
 			mockCreate.mockResolvedValueOnce({
-				choices: [{ message: { content: null } }],
-				usage: {
-					prompt_tokens: 0,
-					completion_tokens: 0,
-					total_tokens: 0,
+				[Symbol.asyncIterator]: async function* () {
+					yield {
+						choices: [
+							{
+								delta: { content: null },
+								index: 0,
+							},
+						],
+						usage: {
+							prompt_tokens: 0,
+							completion_tokens: 0,
+							total_tokens: 0,
+						},
+					}
 				},
 			})
 
@@ -144,10 +153,7 @@ describe("OpenAiNativeHandler", () => {
 				results.push(result)
 			}
 
-			expect(results).toEqual([
-				{ type: "text", text: "" },
-				{ type: "usage", inputTokens: 0, outputTokens: 0 },
-			])
+			expect(results).toEqual([{ type: "usage", inputTokens: 0, outputTokens: 0 }])
 
 			// Verify developer role is used for system prompt with o1 model
 			expect(mockCreate).toHaveBeenCalledWith({
@@ -156,6 +162,8 @@ describe("OpenAiNativeHandler", () => {
 					{ role: "developer", content: "Formatting re-enabled\n" + systemPrompt },
 					{ role: "user", content: "Hello!" },
 				],
+				stream: true,
+				stream_options: { include_usage: true },
 			})
 		})
 

src/api/providers/__tests__/mistral.test.ts

@@ -21,23 +21,42 @@ export class MistralHandler implements ApiHandler {
 	private client: Mistral
 
 	constructor(options: ApiHandlerOptions) {
-		this.options = options
+		if (!options.mistralApiKey) {
+			throw new Error("Mistral API key is required")
+		}
+
+		// Set default model ID if not provided
+		this.options = {
+			...options,
+			apiModelId: options.apiModelId || mistralDefaultModelId,
+		}
+
+		const baseUrl = this.getBaseUrl()
+		console.debug(`[Roo Code] MistralHandler using baseUrl: ${baseUrl}`)
 		this.client = new Mistral({
-			serverURL: "https://codestral.mistral.ai",
+			serverURL: baseUrl,
 			apiKey: this.options.mistralApiKey,
 		})
 	}
 
+	private getBaseUrl(): string {
+		const modelId = this.options.apiModelId ?? mistralDefaultModelId
+		console.debug(`[Roo Code] MistralHandler using modelId: ${modelId}`)
+		if (modelId?.startsWith("codestral-")) {
+			return this.options.mistralCodestralUrl || "https://codestral.mistral.ai"
+		}
+		return "https://api.mistral.ai"
+	}
+
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const stream = await this.client.chat.stream({
-			model: this.getModel().id,
-			// max_completion_tokens: this.getModel().info.maxTokens,
-			temperature: this.options.modelTemperature ?? MISTRAL_DEFAULT_TEMPERATURE,
+		const response = await this.client.chat.stream({
+			model: this.options.apiModelId || mistralDefaultModelId,
 			messages: [{ role: "system", content: systemPrompt }, ...convertToMistralMessages(messages)],
-			stream: true,
+			maxTokens: this.options.includeMaxTokens ? this.getModel().info.maxTokens : undefined,
+			temperature: this.options.modelTemperature ?? MISTRAL_DEFAULT_TEMPERATURE,
 		})
 
-		for await (const chunk of stream) {
+		for await (const chunk of response) {
 			const delta = chunk.data.choices[0]?.delta
 			if (delta?.content) {
 				let content: string = ""
@@ -73,4 +92,25 @@ export class MistralHandler implements ApiHandler {
 			info: mistralModels[mistralDefaultModelId],
 		}
 	}
+
+	async completePrompt(prompt: string): Promise<string> {
+		try {
+			const response = await this.client.chat.complete({
+				model: this.options.apiModelId || mistralDefaultModelId,
+				messages: [{ role: "user", content: prompt }],
+				temperature: this.options.modelTemperature ?? MISTRAL_DEFAULT_TEMPERATURE,
+			})
+
+			const content = response.choices?.[0]?.message.content
+			if (Array.isArray(content)) {
+				return content.map((c) => (c.type === "text" ? c.text : "")).join("")
+			}
+			return content || ""
+		} catch (error) {
+			if (error instanceof Error) {
+				throw new Error(`Mistral completion error: ${error.message}`)
+			}
+			throw error
+		}
+	}
 }

src/api/providers/__tests__/openai-native.test.ts

@@ -56,9 +56,11 @@ export class OpenAiNativeHandler implements ApiHandler, SingleCompletionHandler
 				},
 				...convertToOpenAiMessages(messages),
 			],
+			stream: true,
+			stream_options: { include_usage: true },
 		})
 
-		yield* this.yieldResponseData(response)
+		yield* this.handleStreamResponse(response)
 	}
 
 	private async *handleO3FamilyMessage(