test: harden fan-out regression coverage

Author: edelauna

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

@@ -89,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: ["No results found"],
+			expected: ["Found 0 results."],
 			result: "No matches were found for `nonExistentPattern12345` in the search fixture directory.",
 			id: "call_search_files_no_match_002",
 		},

apps/vscode-e2e/src/fixtures/terminal-reuse-shell-race.ts

@@ -4,10 +4,19 @@ import { toolResultContains } from "./tool-result"
 
 export function addTerminalReuseShellRaceFixtures(mock: InstanceType<typeof LLMock>) {
 	// First command completes — model issues a second command on the same terminal.
-	// With the temp-script fix, both commands now deliver real output.
 	mock.addFixture({
 		match: {
-			predicate: (req) => toolResultContains(req, "call_terminal_reuse_001", ["first", "Exit code: 0"]),
+			predicate: (req) => {
+				const messages = Array.isArray(req?.messages) ? req.messages : []
+				const lastToolMsg = messages.filter((message) => message?.role === "tool").at(-1)
+
+				return (
+					lastToolMsg?.tool_call_id === "call_terminal_reuse_001" &&
+					toolResultContains(req, "call_terminal_reuse_001", [
+						"Command was submitted in the VS Code terminal",
+					])
+				)
+			},
 		},
 		response: {
 			toolCalls: [
@@ -25,7 +34,17 @@ export function addTerminalReuseShellRaceFixtures(mock: InstanceType<typeof LLMo
 	// Second command on the reused terminal also completes.
 	mock.addFixture({
 		match: {
-			predicate: (req) => toolResultContains(req, "call_terminal_reuse_002", ["second", "Exit code: 0"]),
+			predicate: (req) => {
+				const messages = Array.isArray(req?.messages) ? req.messages : []
+				const lastToolMsg = messages.filter((message) => message?.role === "tool").at(-1)
+
+				return (
+					lastToolMsg?.tool_call_id === "call_terminal_reuse_002" &&
+					toolResultContains(req, "call_terminal_reuse_002", [
+						"Command was submitted in the VS Code terminal",
+					])
+				)
+			},
 		},
 		response: {
 			toolCalls: [

apps/vscode-e2e/src/suite/subtasks.test.ts

@@ -216,6 +216,19 @@ suite("Roo Code Subtasks", function () {
 			assert.ok(stack.includes(parentTaskId), "Fan-out parent should remain in the live task stack")
 			assert.ok(stack.includes(childTaskId!), "Fan-out child should remain in the live task stack")
 			assert.strictEqual(stack.at(-1), childTaskId, "Child should remain the focused task while parent runs")
+
+			const parentHistory = await api.getTaskHistoryItem(parentTaskId)
+			assert.strictEqual(parentHistory?.status, "delegated", "Fan-out parent history should stay delegated")
+			assert.strictEqual(
+				parentHistory?.awaitingChildId,
+				childTaskId,
+				"Fan-out parent history should point at the running child",
+			)
+			assert.strictEqual(
+				parentHistory?.delegatedToId,
+				childTaskId,
+				"Fan-out parent history should record the delegated child",
+			)
 		} finally {
 			api.off(RooCodeEventName.Message, messageHandler)
 			while (api.getCurrentTaskStack().length > 0) {