Merge branch 'main' into cte/benchmark-monorepo

Author: cte

e2e/src/suite/extension.test.ts

@@ -2,12 +2,6 @@ import * as assert from "assert"
 import * as vscode from "vscode"
 
 suite("Roo Code Extension", () => {
-	test("OPENROUTER_API_KEY environment variable is set", () => {
-		if (!process.env.OPENROUTER_API_KEY) {
-			assert.fail("OPENROUTER_API_KEY environment variable is not set")
-		}
-	})
-
 	test("Commands should be registered", async () => {
 		const expectedCommands = [
 			"roo-cline.plusButtonClicked",

e2e/src/suite/index.ts

@@ -5,7 +5,7 @@ import * as vscode from "vscode"
 
 import type { RooCodeAPI } from "../../../src/exports/roo-code"
 
-import { waitUntilReady } from "./utils"
+import { waitFor } from "./utils"
 
 declare global {
 	var api: RooCodeAPI
@@ -18,18 +18,25 @@ export async function run() {
 		throw new Error("Extension not found")
 	}
 
-	// Activate the extension if it's not already active.
 	const api = extension.isActive ? extension.exports : await extension.activate()
 
-	// TODO: We might want to support a "free" model out of the box so
-	// contributors can run the tests locally without having to pay.
 	await api.setConfiguration({
-		apiProvider: "openrouter",
+		apiProvider: "openrouter" as const,
 		openRouterApiKey: process.env.OPENROUTER_API_KEY!,
-		openRouterModelId: "anthropic/claude-3.5-sonnet",
+		openRouterModelId: "google/gemini-2.0-flash-001",
+		openRouterModelInfo: {
+			maxTokens: 8192,
+			contextWindow: 1000000,
+			supportsImages: true,
+			supportsPromptCache: false,
+			inputPrice: 0.1,
+			outputPrice: 0.4,
+			thinking: false,
+		},
 	})
 
-	await waitUntilReady({ api })
+	await vscode.commands.executeCommand("roo-cline.SidebarProvider.focus")
+	await waitFor(() => api.isReady())
 
 	// Expose the API to the tests.
 	globalThis.api = api

e2e/src/suite/modes.test.ts

@@ -18,7 +18,11 @@ suite("Roo Code Modes", () => {
 
 		let messages: ClineMessage[] = []
 
-		api.on("message", ({ message }) => messages.push(message))
+		api.on("message", ({ message }) => {
+			if (message.type === "say" && message.partial === false) {
+				messages.push(message)
+			}
+		})
 
 		const switchModesTaskId = await api.startNewTask({
 			configuration: { mode: "Code", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
@@ -31,22 +35,25 @@ suite("Roo Code Modes", () => {
 		 * Grade the response.
 		 */
 
-		const gradePrompt =
-			`Given this prompt: ${switchModesPrompt} grade the response from 1 to 10 in the format of "Grade: (1-10)": ` +
-			messages
-				.filter(({ type }) => type === "say")
-				.map(({ text }) => text ?? "")
-				.join("\n")
+		const response = messages
+			.filter(({ type, say, partial }) => say === "text")
+			.map(({ text }) => text ?? "")
+			.join("\n")
+
+		const gradePrompt = `Given this prompt: ${switchModesPrompt} grade the response from 1 to 10 in the format of "Grade: (1-10)". For example: Grade 7\n\nResponse: ${response}`
 
 		messages = []
 
 		const gradeTaskId = await api.startNewTask({ configuration: { mode: "Ask" }, text: gradePrompt })
-		await waitUntilCompleted({ api, taskId: gradeTaskId, timeout: 60_000 })
+		await waitUntilCompleted({ api, taskId: gradeTaskId })
 
-		const completion = messages.find(({ type, say, partial }) => say === "completion_result" && partial === false)
+		const completion = messages.find(({ type, say, partial }) => say === "completion_result")
 		const match = completion?.text?.match(/Grade: (\d+)/)
 		const score = parseInt(match?.[1] ?? "0")
-		assert.ok(score >= 7 && score <= 10, `Grade must be between 7 and 10 - ${completion?.text}`)
+		assert.ok(
+			score >= 7 && score <= 10,
+			`Grade must be between 7 and 10. DEBUG: score = ${score}, completion = ${completion?.text}`,
+		)
 
 		await api.cancelCurrentTask()
 	})

e2e/src/suite/subtasks.test.ts

@@ -8,11 +8,17 @@ suite("Roo Code Subtasks", () => {
 	test("Should handle subtask cancellation and resumption correctly", async () => {
 		const api = globalThis.api
 
-		const messages: ClineMessage[] = []
-		api.on("message", ({ message }) => messages.push(message))
+		const messages: Record<string, ClineMessage[]> = {}
+
+		api.on("message", ({ taskId, message }) => {
+			if (message.type === "say" && message.partial === false) {
+				messages[taskId] = messages[taskId] || []
+				messages[taskId].push(message)
+			}
+		})
 
 		await api.setConfiguration({
-			mode: "Code",
+			mode: "ask",
 			alwaysAllowModeSwitch: true,
 			alwaysAllowSubtasks: true,
 			autoApprovalEnabled: true,
@@ -34,23 +40,19 @@ suite("Roo Code Subtasks", () => {
 		// Wait for the subtask to be spawned and then cancel it.
 		api.on("taskSpawned", (_, childTaskId) => (spawnedTaskId = childTaskId))
 		await waitFor(() => !!spawnedTaskId)
-		await sleep(2_000) // Give the task a chance to start and populate the history.
+		await sleep(1_000) // Give the task a chance to start and populate the history.
 		await api.cancelCurrentTask()
 
 		// Wait a bit to ensure any task resumption would have happened.
 		await sleep(2_000)
 
 		// The parent task should not have resumed yet, so we shouldn't see
 		// "Parent task resumed".
-		// assert.ok(
-		// 	getMessage({
-		// 		api,
-		// 		taskId: parentTaskId,
-		// 		include: "Parent task resumed",
-		// 		exclude: "You are the parent task",
-		// 	}) === undefined,
-		// 	"Parent task should not have resumed after subtask cancellation",
-		// )
+		assert.ok(
+			messages[parentTaskId].find(({ type, text }) => type === "say" && text === "Parent task resumed") ===
+				undefined,
+			"Parent task should not have resumed after subtask cancellation",
+		)
 
 		// Start a new task with the same message as the subtask.
 		const anotherTaskId = await api.startNewTask({ text: childPrompt })
@@ -60,15 +62,11 @@ suite("Roo Code Subtasks", () => {
 		await sleep(2_000)
 
 		// The parent task should still not have resumed.
-		// assert.ok(
-		// 	getMessage({
-		// 		api,
-		// 		taskId: parentTaskId,
-		// 		include: "Parent task resumed",
-		// 		exclude: "You are the parent task",
-		// 	}) === undefined,
-		// 	"Parent task should not have resumed after subtask cancellation",
-		// )
+		assert.ok(
+			messages[parentTaskId].find(({ type, text }) => type === "say" && text === "Parent task resumed") ===
+				undefined,
+			"Parent task should not have resumed after subtask cancellation",
+		)
 
 		// Clean up - cancel all tasks.
 		await api.clearCurrentTask()

e2e/src/suite/task.test.ts

@@ -9,7 +9,12 @@ suite("Roo Code Task", () => {
 		const api = globalThis.api
 
 		const messages: ClineMessage[] = []
-		api.on("message", ({ message }) => messages.push(message))
+
+		api.on("message", ({ message }) => {
+			if (message.type === "say" && message.partial === false) {
+				messages.push(message)
+			}
+		})
 
 		const taskId = await api.startNewTask({
 			configuration: { mode: "Ask", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
@@ -18,7 +23,7 @@ suite("Roo Code Task", () => {
 
 		await waitUntilCompleted({ api, taskId })
 
-		const completion = messages.find(({ type, say, partial }) => say === "completion_result" && partial === false)
+		const completion = messages.find(({ say, partial }) => say === "completion_result")
 
 		assert.ok(
 			completion?.text?.includes("My name is Roo"),

e2e/src/suite/utils.ts

@@ -9,7 +9,7 @@ type WaitForOptions = {
 
 export const waitFor = (
 	condition: (() => Promise<boolean>) | (() => boolean),
-	{ timeout = 60_000, interval = 250 }: WaitForOptions = {},
+	{ timeout = 30_000, interval = 250 }: WaitForOptions = {},
 ) => {
 	let timeoutId: NodeJS.Timeout | undefined = undefined
 
@@ -41,15 +41,6 @@ export const waitFor = (
 	])
 }
 
-type WaitUntilReadyOptions = WaitForOptions & {
-	api: RooCodeAPI
-}
-
-export const waitUntilReady = async ({ api, ...options }: WaitUntilReadyOptions) => {
-	await vscode.commands.executeCommand("roo-cline.SidebarProvider.focus")
-	await waitFor(() => api.isReady(), options)
-}
-
 type WaitUntilAbortedOptions = WaitForOptions & {
 	api: RooCodeAPI
 	taskId: string

knip.json

@@ -17,7 +17,7 @@
 		"benchmark/**",
 		"src/activate/**",
 		"src/exports/**",
-		"src/schemas/**",
+		"src/schemas/ipc.ts",
 		"src/extension.ts",
 		"scripts/**"
 	],