Merge branch 'main' into feat/icons

Author: elianiva

.changeset/ten-grapes-punch.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Add missing translation

.changeset/wise-spies-type.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Clean up types related to tools

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Roo Code Changelog
 
+## [3.12.3] - 2025-04-17
+
+- Fix character escaping issues in Gemini diff edits
+- Support dragging and dropping tabs into the chat box (thanks @NyxJae!)
+- Make sure slash commands only fire at the beginning of the chat box (thanks @logosstone!)
+
 ## [3.12.2] - 2025-04-16
 
 - Add OpenAI o3 & 4o-mini (thanks @PeterDaveHello!)

README.md

@@ -158,6 +158,7 @@ export function NewRun() {
 					.parse(JSON.parse(await file.text()))
 
 				const providerSettings = providerProfiles.apiConfigs[providerProfiles.currentApiConfigName] ?? {}
+
 				const {
 					apiProvider,
 					apiModelId,
@@ -177,6 +178,7 @@ export function NewRun() {
 					case "gemini":
 					case "mistral":
 					case "openai-native":
+					case "xai":
 					case "vertex":
 						setValue("model", apiModelId ?? "")
 						break

assets/images/roo-logo.svg

@@ -57,7 +57,17 @@ const copyRun = async (runId: number) => {
 		tasks,
 		async (task) => {
 			// eslint-disable-next-line @typescript-eslint/no-unused-vars
-			const { id: _, ...newTaskMetricsValues } = task.taskMetrics!
+			const { id: _, ...newTaskMetricsValues } = task.taskMetrics || {
+				duration: 0,
+				tokensIn: 0,
+				tokensOut: 0,
+				tokensContext: 0,
+				cacheWrites: 0,
+				cacheReads: 0,
+				cost: 0,
+				createdAt: new Date(),
+			}
+
 			const [newTaskMetrics] = await destDb.insert(schema.taskMetrics).values(newTaskMetricsValues).returning()
 
 			if (!newTaskMetrics) {

evals/apps/web/src/app/runs/new/new-run.tsx

@@ -9,7 +9,7 @@ export const rooCodeDefaults: RooCodeSettings = {
 	rateLimitSeconds: 0,
 
 	pinnedApiConfigs: {},
-	lastShownAnnouncementId: "apr-04-2025-boomerang",
+	lastShownAnnouncementId: "apr-16-2025-3-12",
 
 	autoApprovalEnabled: true,
 	alwaysAllowReadOnly: true,
@@ -45,7 +45,7 @@ export const rooCodeDefaults: RooCodeSettings = {
 	maxReadFileLine: 500,
 
 	terminalOutputLineLimit: 500,
-	terminalShellIntegrationTimeout: 15_000,
+	terminalShellIntegrationTimeout: 30000,
 	terminalCommandDelay: 0,
 	terminalPowershellCounter: false,
 	terminalZshClearEolMark: true,

evals/packages/db/scripts/copy-run.mts

@@ -18,6 +18,7 @@ export const providerNames = [
 	"lmstudio",
 	"gemini",
 	"openai-native",
+	"xai",
 	"mistral",
 	"deepseek",
 	"unbound",
@@ -360,6 +361,8 @@ export const providerSettingsSchema = z.object({
 	googleGeminiBaseUrl: z.string().optional(),
 	// OpenAI Native
 	openAiNativeApiKey: z.string().optional(),
+	// XAI
+	xaiApiKey: z.string().optional(),
 	// Mistral
 	mistralApiKey: z.string().optional(),
 	mistralCodestralUrl: z.string().optional(),
@@ -433,6 +436,8 @@ const providerSettingsRecord: ProviderSettingsRecord = {
 	openAiUseAzure: undefined,
 	azureApiVersion: undefined,
 	openAiStreamingEnabled: undefined,
+	// xAI
+	xaiApiKey: undefined,
 	// Ollama
 	ollamaModelId: undefined,
 	ollamaBaseUrl: undefined,