Merge branch 'roo-newrelease' into upstream-pull-13022025

Author: Himanshu-Singh-Chauhan

.clinerules

@@ -16,6 +16,11 @@
    - Logs can be found in `logs\app.log`
      - Logfile is overwritten on each run to keep it to a manageable volume.
 
+4. Styling Guidelines:
+   - Use Tailwind CSS classes instead of inline style objects for new markup
+   - VSCode CSS variables must be added to webview-ui/src/index.css before using them in Tailwind classes
+   - Example: `<div className="text-md text-vscode-descriptionForeground mb-2" />` instead of style objects
+
 
 # Adding a New Setting
 

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Roo Code Changelog
 
+## 3.3.20
+
+### Patch Changes
+
+- Disable writing in ask mode
+- v3.3.20
+
 ## [3.3.19]
 
 - Fix a bug where aborting in the middle of file writes would not revert the write

package-lock.json

@@ -3,7 +3,7 @@
 	"displayName": "PearAI Roo Code / Cline",
 	"description": "PearAI's integration of Roo Code / Cline, a coding agent.",
 	"publisher": "PearAI",
-	"version": "3.3.19",
+	"version": "3.3.20",
 	"icon": "assets/icons/pear.png",
 	"galleryBanner": {
 		"color": "#617A91",
@@ -287,7 +287,9 @@
 		"compile:integration": "tsc -p tsconfig.integration.json",
 		"install:all": "npm install && cd webview-ui && npm install",
 		"lint": "eslint src --ext ts && npm run lint --prefix webview-ui",
+		"lint-local": "eslint -c .eslintrc.local.json src --ext ts && npm run lint --prefix webview-ui",
 		"lint-fix": "eslint src --ext ts --fix && npm run lint-fix --prefix webview-ui",
+		"lint-fix-local": "eslint -c .eslintrc.local.json src --ext ts --fix && npm run lint-fix --prefix webview-ui",
 		"package": "npm run build:webview && npm run check-types && npm run lint && node esbuild.js --production",
 		"pretest": "npm run compile && npm run compile:integration",
 		"dev": "cd webview-ui && npm run dev",

package.json

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

src/__mocks__/get-folder-size.js

@@ -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/api/providers/__tests__/mistral.test.ts

@@ -21,23 +21,36 @@ export class MistralHandler implements ApiHandler {
 	private client: Mistral
 
 	constructor(options: ApiHandlerOptions) {
+		if (!options.mistralApiKey) {
+			throw new Error("Mistral API key is required")
+		}
+
 		this.options = options
+		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
+		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,
+		const response = await this.client.chat.stream({
+			model: this.options.apiModelId || mistralDefaultModelId,
+			messages: convertToMistralMessages(messages),
+			maxTokens: this.options.includeMaxTokens ? this.getModel().info.maxTokens : undefined,
 			temperature: this.options.modelTemperature ?? MISTRAL_DEFAULT_TEMPERATURE,
-			messages: [{ role: "system", content: systemPrompt }, ...convertToMistralMessages(messages)],
-			stream: true,
 		})
 
-		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 = ""

src/api/providers/mistral.ts

@@ -3112,11 +3112,14 @@ export class Cline {
 		}
 
 		details += "\n\n# VSCode Open Tabs"
+		const { maxOpenTabsContext } = (await this.providerRef.deref()?.getState()) ?? {}
+		const maxTabs = maxOpenTabsContext ?? 20
 		const openTabs = vscode.window.tabGroups.all
 			.flatMap((group) => group.tabs)
 			.map((tab) => (tab.input as vscode.TabInputText)?.uri?.fsPath)
 			.filter(Boolean)
 			.map((absolutePath) => path.relative(cwd, absolutePath).toPosix())
+			.slice(0, maxTabs)
 			.join("\n")
 		if (openTabs) {
 			details += `\n${openTabs}`

src/core/Cline.ts

@@ -475,6 +475,7 @@ describe("Cline", () => {
 				// Mock abort state
 				Object.defineProperty(cline, "abort", {
 					get: () => false,
+					set: () => {},
 					configurable: true,
 				})
 
@@ -603,10 +604,12 @@ describe("Cline", () => {
 				// Mock abort state for both instances
 				Object.defineProperty(clineWithImages, "abort", {
 					get: () => false,
+					set: () => {},
 					configurable: true,
 				})
 				Object.defineProperty(clineWithoutImages, "abort", {
 					get: () => false,
+					set: () => {},
 					configurable: true,
 				})