diff --git a/e2e/src/suite/index.ts b/e2e/src/suite/index.ts
index 3a0fe27255..62dd9f7700 100644
--- a/e2e/src/suite/index.ts
+++ b/e2e/src/suite/index.ts
@@ -3,7 +3,7 @@ import Mocha from "mocha"
 import { glob } from "glob"
 import * as vscode from "vscode"
 
-import { RooCodeAPI } from "../../../src/exports/roo-code"
+import type { RooCodeAPI } from "../../../src/exports/roo-code"
 
 import { waitUntilReady } from "./utils"
 
diff --git a/e2e/src/suite/modes.test.ts b/e2e/src/suite/modes.test.ts
index e2282b27ca..f910ed6f57 100644
--- a/e2e/src/suite/modes.test.ts
+++ b/e2e/src/suite/modes.test.ts
@@ -1,6 +1,6 @@
 import * as assert from "assert"
 
-import { RooCodeEventName, ClineMessage } from "../../../src/exports/roo-code"
+import type { ClineMessage } from "../../../src/exports/roo-code"
 
 import { waitUntilCompleted } from "./utils"
 
@@ -18,7 +18,7 @@ suite("Roo Code Modes", () => {
 
 		let messages: ClineMessage[] = []
 
-		api.on(RooCodeEventName.Message, ({ message }) => messages.push(message))
+		api.on("message", ({ message }) => messages.push(message))
 
 		const switchModesTaskId = await api.startNewTask({
 			configuration: { mode: "Code", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
diff --git a/e2e/src/suite/subtasks.test.ts b/e2e/src/suite/subtasks.test.ts
index 16ef89f994..595a218782 100644
--- a/e2e/src/suite/subtasks.test.ts
+++ b/e2e/src/suite/subtasks.test.ts
@@ -1,6 +1,6 @@
 import * as assert from "assert"
 
-import { RooCodeEventName, ClineMessage } from "../../../src/exports/roo-code"
+import type { ClineMessage } from "../../../src/exports/roo-code"
 
 import { sleep, waitFor, waitUntilCompleted } from "./utils"
 
@@ -9,7 +9,7 @@ suite("Roo Code Subtasks", () => {
 		const api = globalThis.api
 
 		const messages: ClineMessage[] = []
-		api.on(RooCodeEventName.Message, ({ message }) => messages.push(message))
+		api.on("message", ({ message }) => messages.push(message))
 
 		await api.setConfiguration({
 			mode: "Code",
diff --git a/e2e/src/suite/task.test.ts b/e2e/src/suite/task.test.ts
index 7924838414..25f2bfb435 100644
--- a/e2e/src/suite/task.test.ts
+++ b/e2e/src/suite/task.test.ts
@@ -1,6 +1,6 @@
 import * as assert from "assert"
 
-import { RooCodeEventName, ClineMessage } from "../../../src/exports/roo-code"
+import type { ClineMessage } from "../../../src/exports/roo-code"
 
 import { waitUntilCompleted } from "./utils"
 
@@ -9,7 +9,7 @@ suite("Roo Code Task", () => {
 		const api = globalThis.api
 
 		const messages: ClineMessage[] = []
-		api.on(RooCodeEventName.Message, ({ message }) => messages.push(message))
+		api.on("message", ({ message }) => messages.push(message))
 
 		const taskId = await api.startNewTask({
 			configuration: { mode: "Ask", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
diff --git a/e2e/src/suite/utils.ts b/e2e/src/suite/utils.ts
index 70d6d59c09..2e42f5ea20 100644
--- a/e2e/src/suite/utils.ts
+++ b/e2e/src/suite/utils.ts
@@ -1,6 +1,6 @@
 import * as vscode from "vscode"
 
-import { RooCodeAPI } from "../../../src/exports/roo-code"
+import type { RooCodeAPI } from "../../../src/exports/roo-code"
 
 type WaitForOptions = {
 	timeout?: number