test(e2e-mock): fix flaky subtasks fixture collision and task identity prompt (#561) (#563)

* test(e2e-mock): fix flaky subtasks fixture collision and task identity prompt (#561)

* test(e2e): updating subtask text fixture pattern

---------

Co-authored-by: Bertan Ari <bertanari@microsoft.com>
Co-authored-by: Elliott de Launay <edelauna@gmail.com>

Author: 3 people

apps/vscode-e2e/fixtures/task-hello-world.json

@@ -2,13 +2,13 @@
 	"fixtures": [
 		{
 			"match": {
-				"userMessage": "Hello world, what is your name? Respond with 'My name is ...'"
+				"userMessage": "TASK_HELLO_WORLD_SMOKE"
 			},
 			"response": {
 				"toolCalls": [
 					{
 						"name": "attempt_completion",
-						"arguments": "{\"result\":\"My name is Zoo! I'm your AI coding assistant, here to help you with development tasks.\"}",
+						"arguments": "{\"result\":\"My name is Zoo.\"}",
 						"id": "call_task_hello_world_001"
 					}
 				]

apps/vscode-e2e/src/fixtures/subtasks.ts

@@ -177,9 +177,13 @@ export function addSubtaskFixtures(mock: InstanceType<typeof LLMock>) {
 		},
 	})
 
+	// Issue #561: parent prompt embeds SAME_CHILD_MARKER verbatim, so parent-resume turns
+	// also match a bare substring check. Exclude the parent marker to let them fall through.
 	mock.addFixture({
 		match: {
-			userMessage: new RegExp(SUBTASK_XPROFILE_SAME_CHILD_MARKER),
+			predicate: (req) =>
+				requestContains(req, [SUBTASK_XPROFILE_SAME_CHILD_MARKER]) &&
+				!requestContains(req, [SUBTASK_XPROFILE_PARENT_MARKER]),
 		},
 		response: {
 			toolCalls: [
@@ -212,6 +216,8 @@ export function addSubtaskFixtures(mock: InstanceType<typeof LLMock>) {
 		},
 	})
 
+	// Safe as bare regex: DIFFERENT_CHILD_MARKER is NOT embedded in SUBTASK_XPROFILE_PARENT_PROMPT,
+	// so parent-resume turns never contain it. If that ever changes, add an exclusion predicate.
 	mock.addFixture({
 		match: {
 			userMessage: new RegExp(SUBTASK_XPROFILE_DIFFERENT_CHILD_MARKER),

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

@@ -21,7 +21,7 @@ suite("Roo Code Task", function () {
 
 		const taskId = await api.startNewTask({
 			configuration: { mode: "ask", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
-			text: "Hello world, what is your name? Respond with 'My name is ...'",
+			text: "TASK_HELLO_WORLD_SMOKE: what is your name?",
 		})
 
 		await waitUntilCompleted({ api, taskId })