Fix e2e tests

Author: cte

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,25 +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 = [
+			"SidebarProvider.open",
+			"SidebarProvider.focus",
+			"SidebarProvider.resetViewLocation",
+			"SidebarProvider.toggleVisibility",
+			"SidebarProvider.removeView",
+			"activationCompleted",
 			"plusButtonClicked",
 			"mcpButtonClicked",
-			"historyButtonClicked",
+			"promptsButtonClicked",
 			"popoutButtonClicked",
-			"settingsButtonClicked",
 			"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) {
-			const [_prefix, command] = cmd.split(".")
-			assert.ok(commands.includes(command), `Command ${command} 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, Package } from "../../../src/exports/roo-code"
+import { type RooCodeAPI, Package } from "@roo-code/types"
 
 import { waitFor } from "./utils"
 
@@ -26,7 +26,7 @@ export async function run() {
 		openRouterModelId: "google/gemini-2.0-flash-001",
 	})
 
-	await vscode.commands.executeCommand(`${Package.publisher}.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"
 

e2e/src/suite/task.test.ts

@@ -1,4 +1,4 @@
-import type { RooCodeAPI } from "../../../src/exports/roo-code"
+import type { RooCodeAPI } from "@roo-code/types"
 
 type WaitForOptions = {
 	timeout?: number