Merge upstream main into vertex-apikey branch

Author: kiwina

.gitignore

@@ -43,3 +43,4 @@ logs
 .idea/
 .qodo/
 .vercel
+.roo/mcp.json

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Roo Code Changelog
 
+## [3.19.5] - 2025-06-05
+
+- Fix Gemini 2.5 Pro Preview thinking budget bug
+
 ## [3.19.4] - 2025-06-05
 
 - Add Gemini Pro 06-05 model support (thanks @daniel-lxs and @shariqriazz!)

apps/web-evals/package.json

@@ -5,7 +5,7 @@
 	"scripts": {
 		"lint": "next lint",
 		"check-types": "tsc -b",
-		"dev": "scripts/check-services.sh && next dev --turbopack",
+		"dev": "scripts/check-services.sh && next dev",
 		"format": "prettier --write src",
 		"build": "next build",
 		"start": "next start"

apps/web-evals/src/lib/server/exercises.ts renamed to apps/web-evals/src/actions/exercises.ts

@@ -6,7 +6,9 @@ import { fileURLToPath } from "url"
 
 import { type ExerciseLanguage, exerciseLanguages } from "@roo-code/evals"
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const __dirname = path.dirname(fileURLToPath(import.meta.url)) // <repo>/apps/web-evals/src/actions
+
+const EXERCISES_BASE_PATH = path.resolve(__dirname, "../../../../../evals")
 
 export const listDirectories = async (relativePath: string) => {
 	try {
@@ -19,9 +21,6 @@ export const listDirectories = async (relativePath: string) => {
 	}
 }
 
-// __dirname = <repo>/evals/apps/web/src/lib/server
-const EXERCISES_BASE_PATH = path.resolve(__dirname, "../../../../../../evals")
-
 export const getExercises = async () => {
 	const result = await Promise.all(
 		exerciseLanguages.map(async (language) => {

apps/web-evals/src/actions/heartbeat.ts

@@ -0,0 +1,8 @@
+"use server"
+
+import { redisClient } from "@/lib/server/redis"
+
+export const getHeartbeat = async (runId: number) => {
+	const redis = await redisClient()
+	return redis.get(`heartbeat:${runId}`)
+}

apps/web-evals/src/lib/server/runners.ts renamed to apps/web-evals/src/actions/runners.ts

@@ -1,6 +1,6 @@
 "use server"
 
-import { redisClient } from "./redis"
+import { redisClient } from "@/lib/server/redis"
 
 export const getRunners = async (runId: number) => {
 	const redis = await redisClient()

apps/web-evals/src/lib/server/runs.ts renamed to apps/web-evals/src/actions/runs.ts

@@ -7,7 +7,7 @@ import { Ellipsis, Rocket } from "lucide-react"
 
 import type { Run, TaskMetrics } from "@roo-code/evals"
 
-import { deleteRun } from "@/lib/server/runs"
+import { deleteRun } from "@/actions/runs"
 import { formatCurrency, formatDuration, formatTokens, formatToolUsageSuccessRate } from "@/lib/formatters"
 import {
 	Button,