fix(e2e): address orchestrator review feedback

Author: easonliang28

.github/workflows/e2e.yml

@@ -34,6 +34,10 @@ jobs:
             - name: Setup Node.js and pnpm
               if: github.event_name != 'pull_request' || steps.e2e-marker.outputs.cache-hit != 'true'
               uses: ./.github/actions/setup-node-pnpm
+            - name: Run vscode-e2e unit tests
+              if: github.event_name != 'pull_request' || steps.e2e-marker.outputs.cache-hit != 'true'
+              run: pnpm --filter @roo-code/vscode-e2e test:unit
+
             - name: Install xvfb
               if: github.event_name != 'pull_request' || steps.e2e-marker.outputs.cache-hit != 'true'
               run: sudo apt-get install -y xvfb
@@ -144,10 +148,6 @@ jobs:
                       apps/vscode-e2e/.vscode-test/
                   key: vscode-test-${{ runner.os }}-${{ steps.vscode-ver.outputs.version }}-v1
 
-            - name: Run vscode-e2e unit tests
-              if: github.event_name != 'pull_request' || steps.e2e-marker.outputs.cache-hit != 'true'
-              run: pnpm --filter @roo-code/vscode-e2e test:unit
-
             - name: Run mocked E2E tests
               id: run-e2e
               # merge_group and workflow_dispatch always run; cache skip is pull_request only

apps/vscode-e2e/src/fixtures/orchestrator-plan.spec.ts

@@ -6,6 +6,7 @@ import {
 	ORCHESTRATOR_CANCELLATION_RECOVERY_CHILD_STEP,
 	ORCHESTRATOR_CANCELLATION_RECOVERY_FINAL_RESULT,
 	ORCHESTRATOR_CANCELLATION_RECOVERY_FOLLOWUP_ANSWER,
+	ORCHESTRATOR_CANCELLATION_RECOVERY_FOLLOWUP_TOOL_CALL_ID,
 	ORCHESTRATOR_CANCELLATION_RECOVERY_MARKER,
 	ORCHESTRATOR_CANCELLATION_RECOVERY_PARENT_PROMPT,
 	ORCHESTRATOR_FAN_OUT_PARENT_PROMPT,
@@ -34,7 +35,7 @@ import {
 	shouldMatchOrchestratorResumeRequest,
 } from "./orchestrator-plan"
 
-describe("orchestrator fan-out delegation plan", () => {
+describe("orchestrator delegation plans", () => {
 	it("defines the first commit single-round ask/architect/code child sequence", () => {
 		expect(ORCHESTRATOR_FAN_OUT_PARENT_PROMPT).toContain("ORCHESTRATOR_SINGLE_ROUND_FAN_OUT")
 		expect(ORCHESTRATOR_FAN_OUT_CHILD_STEPS).toEqual([
@@ -320,7 +321,7 @@ describe("orchestrator fan-out delegation plan", () => {
 	it("matches cancellation child completion only after the recovery answer", () => {
 		expect(
 			shouldMatchOrchestratorCancellationChildCompletionRequest(
-				`${ORCHESTRATOR_CANCELLATION_RECOVERY_CHILD_STEP.marker} call_orchestrator_cancellation_child_followup_001 ${ORCHESTRATOR_CANCELLATION_RECOVERY_FOLLOWUP_ANSWER}`,
+				`${ORCHESTRATOR_CANCELLATION_RECOVERY_CHILD_STEP.marker} ${ORCHESTRATOR_CANCELLATION_RECOVERY_FOLLOWUP_TOOL_CALL_ID} ${ORCHESTRATOR_CANCELLATION_RECOVERY_FOLLOWUP_ANSWER}`,
 			),
 		).toBe(true)
 		expect(

apps/vscode-e2e/src/fixtures/orchestrator-plan.ts

@@ -126,7 +126,7 @@ export const ORCHESTRATOR_REPEATED_DELEGATION_CHILD_STEPS: readonly Orchestrator
 
 export const ORCHESTRATOR_REPEATED_DELEGATION_PARENT_PROMPT = `${ORCHESTRATOR_REPEATED_DELEGATION_MARKER}: Run exactly three rounds. In each round, delegate exactly three children in order: ask-mode requirements, architect-mode design, then code-mode implementation. Use these exact child messages in order: ${ORCHESTRATOR_REPEATED_DELEGATION_CHILD_STEPS.map(({ prompt }) => `"${prompt}"`).join("; ")}. After each child returns, resume the parent before creating the next child. After all nine children return, complete with a final summary containing every round and child summary.`
 
-export const ORCHESTRATOR_REPEATED_DELEGATION_FINAL_RESULT = `Orchestrator repeated delegation complete:\n${ORCHESTRATOR_REPEATED_DELEGATION_CHILD_STEPS.map(({ round, role, summary }) => `- Round ${round} ${role}: ${summary}`).join("\\n")}`
+export const ORCHESTRATOR_REPEATED_DELEGATION_FINAL_RESULT = `Orchestrator repeated delegation complete:\n${ORCHESTRATOR_REPEATED_DELEGATION_CHILD_STEPS.map(({ round, role, summary }) => `- Round ${round} ${role}: ${summary}`).join("\n")}`
 
 export const ORCHESTRATOR_NESTED_DELEGATION_GRANDCHILD_STEPS: readonly OrchestratorNestedDelegationStep[] = [
 	{
@@ -166,6 +166,8 @@ export const ORCHESTRATOR_NESTED_DELEGATION_PARENT_PROMPT = `${ORCHESTRATOR_NEST
 export const ORCHESTRATOR_NESTED_DELEGATION_FINAL_RESULT = `Nested top-level orchestrator complete:\n- B: ${ORCHESTRATOR_NESTED_DELEGATION_CHILD_FINAL_RESULT}`
 
 export const ORCHESTRATOR_CANCELLATION_RECOVERY_FOLLOWUP_ANSWER = "resume recovered cancellation child"
+export const ORCHESTRATOR_CANCELLATION_RECOVERY_FOLLOWUP_TOOL_CALL_ID =
+	"call_orchestrator_cancellation_child_followup_001"
 
 export const ORCHESTRATOR_CANCELLATION_RECOVERY_CHILD_STEP: OrchestratorCancellationRecoveryStep = {
 	role: "cancellation-child",
@@ -232,23 +234,16 @@ function shouldMatchOrchestratorCancellationChildBase(rawRequest: string): boole
 }
 
 export function shouldMatchOrchestratorCancellationChildRequest(rawRequest: string): boolean {
-	const followupToolCallId = ORCHESTRATOR_CANCELLATION_RECOVERY_CHILD_STEP.completionToolCallId.replace(
-		"completion_002",
-		"followup_001",
+	return (
+		shouldMatchOrchestratorCancellationChildBase(rawRequest) &&
+		!rawRequest.includes(ORCHESTRATOR_CANCELLATION_RECOVERY_FOLLOWUP_TOOL_CALL_ID)
 	)
-
-	return shouldMatchOrchestratorCancellationChildBase(rawRequest) && !rawRequest.includes(followupToolCallId)
 }
 
 export function shouldMatchOrchestratorCancellationChildCompletionRequest(rawRequest: string): boolean {
-	const followupToolCallId = ORCHESTRATOR_CANCELLATION_RECOVERY_CHILD_STEP.completionToolCallId.replace(
-		"completion_002",
-		"followup_001",
-	)
-
 	return (
 		shouldMatchOrchestratorCancellationChildBase(rawRequest) &&
-		((rawRequest.includes(followupToolCallId) &&
+		((rawRequest.includes(ORCHESTRATOR_CANCELLATION_RECOVERY_FOLLOWUP_TOOL_CALL_ID) &&
 			rawRequest.includes(ORCHESTRATOR_CANCELLATION_RECOVERY_FOLLOWUP_ANSWER)) ||
 			rawRequest.includes(
 				`<user_message>\\n${ORCHESTRATOR_CANCELLATION_RECOVERY_FOLLOWUP_ANSWER}\\n</user_message>`,