test(e2e): address review feedback on readonly tool fixtures

Author: edelauna

apps/vscode-e2e/fixtures/list-files.json

@@ -0,0 +1,15 @@
+import type { ChatCompletionRequest, ChatMessage } from "@copilotkit/aimock"
+
+export function toolResultContains(req: ChatCompletionRequest, toolCallId: string, expected: string[]) {
+	const messages = Array.isArray(req?.messages) ? req.messages : []
+	const toolMessage = messages.find(
+		(message: ChatMessage) => message?.role === "tool" && message.tool_call_id === toolCallId,
+	)
+
+	const content = toolMessage?.content
+	if (typeof content !== "string") {
+		return false
+	}
+
+	return expected.every((text) => content.includes(text))
+}

apps/vscode-e2e/src/fixtures/fixture-utils.ts

@@ -1,5 +1,6 @@
 import { LLMock } from "@copilotkit/aimock"
-import type { ChatCompletionRequest, ChatMessage } from "@copilotkit/aimock"
+
+import { toolResultContains } from "./fixture-utils"
 
 type ListFilesFixture = {
 	userMessagePattern: string
@@ -11,20 +12,6 @@ type ListFilesFixture = {
 	id: string
 }
 
-function toolResultContains(req: ChatCompletionRequest, toolCallId: string, expected: string[]) {
-	const messages = Array.isArray(req?.messages) ? req.messages : []
-	const toolMessage = messages.find(
-		(message: ChatMessage) => message?.role === "tool" && message.tool_call_id === toolCallId,
-	)
-
-	const content = toolMessage?.content
-	if (typeof content !== "string") {
-		return false
-	}
-
-	return expected.every((text) => content.includes(text))
-}
-
 export function addListFilesResultFixtures(mock: InstanceType<typeof LLMock>) {
 	const fixtures: ListFilesFixture[] = [
 		{
@@ -46,7 +33,7 @@ export function addListFilesResultFixtures(mock: InstanceType<typeof LLMock>) {
 			id: "call_list_files_recursive_002",
 		},
 		{
-			userMessagePattern: "list-files-symlink-fixture.*recursive=false",
+			userMessagePattern: "path='list-files-symlink-fixture'",
 			toolName: "list_files",
 			arguments: '{"path":"list-files-symlink-fixture","recursive":false}',
 			toolCallId: "call_list_files_symlink_001",

apps/vscode-e2e/src/fixtures/list-files.ts

@@ -1,5 +1,6 @@
 import { LLMock } from "@copilotkit/aimock"
-import type { ChatCompletionRequest, ChatMessage } from "@copilotkit/aimock"
+
+import { toolResultContains } from "./fixture-utils"
 
 type SearchFilesFixture = {
 	userMessagePattern: string
@@ -11,20 +12,6 @@ type SearchFilesFixture = {
 	id: string
 }
 
-function toolResultContains(req: ChatCompletionRequest, toolCallId: string, expected: string[]) {
-	const messages = Array.isArray(req?.messages) ? req.messages : []
-	const toolMessage = messages.find(
-		(message: ChatMessage) => message?.role === "tool" && message.tool_call_id === toolCallId,
-	)
-
-	const content = toolMessage?.content
-	if (typeof content !== "string") {
-		return false
-	}
-
-	return expected.every((text) => content.includes(text))
-}
-
 export function addSearchFilesResultFixtures(mock: InstanceType<typeof LLMock>) {
 	const fixtures: SearchFilesFixture[] = [
 		{
@@ -102,7 +89,7 @@ export function addSearchFilesResultFixtures(mock: InstanceType<typeof LLMock>)
 			toolName: "search_files",
 			arguments: '{"path":"search-files-tool-fixture","regex":"nonExistentPattern12345"}',
 			toolCallId: "call_search_files_no_match_001",
-			expected: ["Found 0 results."],
+			expected: ["No results found"],
 			result: "No matches were found for `nonExistentPattern12345` in the search fixture directory.",
 			id: "call_search_files_no_match_002",
 		},

apps/vscode-e2e/src/fixtures/search-files.ts

@@ -3,7 +3,7 @@ import Mocha from "mocha"
 import { glob } from "glob"
 import * as vscode from "vscode"
 
-import type { RooCodeAPI, RooCodeEventName } from "@roo-code/types"
+import { RooCodeEventName, type RooCodeAPI } from "@roo-code/types"
 
 import { waitFor } from "./utils"
 
@@ -33,14 +33,14 @@ export async function run() {
 
 	// Automatically approve completion_result asks so tests don't stall waiting
 	// for a button that the webview routes to "start new task" rather than "yes".
-	api.on("message" as RooCodeEventName.Message, ({ message }) => {
+	api.on(RooCodeEventName.Message, ({ message }) => {
 		if (message.type === "ask" && message.ask === "completion_result") {
 			api.approveCurrentAsk()
 		}
 	})
 
 	if (!aimockUrl) {
-		api.on("message" as RooCodeEventName.Message, ({ message }) => {
+		api.on(RooCodeEventName.Message, ({ message }) => {
 			if (message.type === "say" && !message.partial) {
 				console.log(`[say:${message.say}]`, message.text?.slice(0, 300))
 			}

apps/vscode-e2e/src/suite/index.ts

@@ -347,7 +347,7 @@ This directory contains various files and subdirectories for testing the list_fi
 
 			console.log("Symlink test Task ID:", taskId)
 
-			// Wait for task completion
+			// 120s: real models may loop before finding the symlink fixture path.
 			await waitFor(() => taskCompleted, { timeout: 120_000 })
 
 			const completionMessage = messages.find((m) => {