Merge branch 'main' into feat/3676-mcp-reload

Author: seedlord

.changeset/clean-taxis-feel.md

@@ -0,0 +1,6 @@
+---
+"roo-cline": patch
+---
+
+Add support for `gemini-2.5-flash-preview-05-20` on the Vertex provider
+Add support for `gemini-2.5-flash-preview-05-20:thinking` on the Vertex provider

.changeset/four-emus-invite.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Add a UI indicator while the context is condensing

.gitignore

@@ -13,7 +13,7 @@ mock/
 
 # Builds
 bin/
-roo-cline-*.vsix
+*.vsix
 
 # Local prompts and rules
 /local-prompts

e2e/package-lock.json

@@ -10,8 +10,8 @@
 		"build": "rimraf out && tsc -p tsconfig.json",
 		"vscode-test": "cd .. && npm run vscode-test"
 	},
-	"dependencies": {},
 	"devDependencies": {
+		"@roo-code/types": "^1.12.0",
 		"@types/mocha": "^10.0.10",
 		"@vscode/test-cli": "^0.0.10",
 		"@vscode/test-electron": "^2.4.0",

e2e/package.json

@@ -1,24 +1,47 @@
 import * as assert from "assert"
 import * as vscode from "vscode"
 
+import { Package } from "@roo-code/types"
+
 suite("Roo Code Extension", () => {
 	test("Commands should be registered", async () => {
 		const expectedCommands = [
-			"roo-cline.plusButtonClicked",
-			"roo-cline.mcpButtonClicked",
-			"roo-cline.historyButtonClicked",
-			"roo-cline.popoutButtonClicked",
-			"roo-cline.settingsButtonClicked",
-			"roo-cline.openInNewTab",
-			"roo-cline.explainCode",
-			"roo-cline.fixCode",
-			"roo-cline.improveCode",
+			"SidebarProvider.open",
+			"SidebarProvider.focus",
+			"SidebarProvider.resetViewLocation",
+			"SidebarProvider.toggleVisibility",
+			"SidebarProvider.removeView",
+			"activationCompleted",
+			"plusButtonClicked",
+			"mcpButtonClicked",
+			"promptsButtonClicked",
+			"popoutButtonClicked",
+			"openInNewTab",
+			"settingsButtonClicked",
+			"historyButtonClicked",
+			"showHumanRelayDialog",
+			"registerHumanRelayCallback",
+			"unregisterHumanRelayCallback",
+			"handleHumanRelayResponse",
+			"newTask",
+			"setCustomStoragePath",
+			"focusInput",
+			"acceptInput",
+			"explainCode",
+			"fixCode",
+			"improveCode",
+			"addToContext",
+			"terminalAddToContext",
+			"terminalFixCommand",
+			"terminalExplainCommand",
 		]
 
-		const commands = await vscode.commands.getCommands(true)
+		const commands = new Set(
+			(await vscode.commands.getCommands(true)).filter((cmd) => cmd.startsWith(Package.name)),
+		)
 
-		for (const cmd of expectedCommands) {
-			assert.ok(commands.includes(cmd), `Command ${cmd} should be registered`)
+		for (const command of expectedCommands) {
+			assert.ok(commands.has(`${Package.name}.${command}`), `Command ${command} should be registered`)
 		}
 	})
 })

e2e/src/suite/extension.test.ts

@@ -3,7 +3,7 @@ import Mocha from "mocha"
 import { glob } from "glob"
 import * as vscode from "vscode"
 
-import type { RooCodeAPI } from "../../../src/exports/roo-code"
+import { type RooCodeAPI, Package } from "@roo-code/types"
 
 import { waitFor } from "./utils"
 
@@ -12,7 +12,7 @@ declare global {
 }
 
 export async function run() {
-	const extension = vscode.extensions.getExtension<RooCodeAPI>("RooVeterinaryInc.roo-cline")
+	const extension = vscode.extensions.getExtension<RooCodeAPI>(`${Package.publisher}.${Package.name}`)
 
 	if (!extension) {
 		throw new Error("Extension not found")
@@ -26,7 +26,7 @@ export async function run() {
 		openRouterModelId: "google/gemini-2.0-flash-001",
 	})
 
-	await vscode.commands.executeCommand("roo-cline.SidebarProvider.focus")
+	await vscode.commands.executeCommand(`${Package.name}.SidebarProvider.focus`)
 	await waitFor(() => api.isReady())
 
 	// Expose the API to the tests.

e2e/src/suite/index.ts

@@ -1,6 +1,6 @@
 import * as assert from "assert"
 
-import type { ClineMessage } from "../../../src/exports/roo-code"
+import type { ClineMessage } from "@roo-code/types"
 
 import { waitUntilCompleted } from "./utils"
 

e2e/src/suite/modes.test.ts

@@ -1,6 +1,6 @@
 import * as assert from "assert"
 
-import type { ClineMessage } from "../../../src/exports/roo-code"
+import type { ClineMessage } from "@roo-code/types"
 
 import { sleep, waitFor, waitUntilCompleted } from "./utils"
 

e2e/src/suite/subtasks.test.ts

@@ -1,6 +1,6 @@
 import * as assert from "assert"
 
-import type { ClineMessage } from "../../../src/exports/roo-code"
+import type { ClineMessage } from "@roo-code/types"
 
 import { waitUntilCompleted } from "./utils"