fix(terminal): await onCompleted callback when exit details are missing to resolve E2E race condition

Author: edelauna

apps/vscode-e2e/fixtures/fast-exit-shell-race.json

@@ -8,7 +8,7 @@
 				"toolCalls": [
 					{
 						"name": "execute_command",
-						"arguments": "{\"command\":\"python3 -c \\\"\\nimport sys\\nprint('boom', file=sys.stderr)\\nsys.exit(1)\\n\\\"\"}",
+						"arguments": "{\"command\":\"echo boom >&2\\nfalse\"}",
 						"id": "call_fast_exit_shell_race_001"
 					}
 				]

apps/vscode-e2e/src/suite/tools/fast-exit-shell-race.test.ts

@@ -27,19 +27,53 @@
  * shell-integration event/stream plumbing.
  */
 import * as assert from "assert"
+import * as vscode from "vscode"
 
 import { RooCodeEventName, type ClineMessage } from "@roo-code/types"
 
 import { waitUntilCompleted } from "../utils"
 import { setDefaultSuiteTimeout } from "../test-utils"
 
+const PROFILE_NAME = "Zoo E2E Zsh"
+
 suite("Fast-exit shell integration race", function () {
 	if (process.platform !== "linux") {
 		return
 	}
 
 	setDefaultSuiteTimeout(this)
 
+	let originalProfiles: Record<string, unknown> | undefined
+
+	suiteSetup(async () => {
+		// Save the current global linux profiles so we can restore them in teardown.
+		originalProfiles = vscode.workspace
+			.getConfiguration("terminal.integrated.profiles")
+			.inspect<Record<string, unknown>>("linux")?.globalValue
+
+		// Write a Zsh test profile to VS Code global settings to bypass the VS Code Bash parser bug
+		await vscode.workspace.getConfiguration("terminal.integrated.profiles").update(
+			"linux",
+			{
+				...originalProfiles,
+				[PROFILE_NAME]: { path: "/bin/zsh", args: ["--no-globalrcs", "--norc"] },
+			},
+			vscode.ConfigurationTarget.Global,
+		)
+
+		// Activate the profile override
+		globalThis.api.setTerminalProfile(PROFILE_NAME)
+	})
+
+	suiteTeardown(async () => {
+		// Restore profiles
+		globalThis.api.setTerminalProfile(undefined)
+
+		await vscode.workspace
+			.getConfiguration("terminal.integrated.profiles")
+			.update("linux", originalProfiles, vscode.ConfigurationTarget.Global)
+	})
+
 	setup(async () => {
 		try {
 			await globalThis.api.cancelCurrentTask()

src/core/tools/ExecuteCommandTool.ts

@@ -340,6 +340,8 @@ export async function executeCommandInTerminal(
 		resolveOnCompleted = resolve
 	})
 
+	let isCompletedTriggered = false
+
 	const callbacks: RooTerminalCallbacks = {
 		onLine: async (lines: string, process: RooTerminalProcess) => {
 			accumulatedOutput += lines
@@ -379,6 +381,7 @@ export async function executeCommandInTerminal(
 			}
 		},
 		onCompleted: async (output: string | undefined) => {
+			isCompletedTriggered = true
 			try {
 				clearTimeout(pendingCommandOutputEmitTimer)
 				pendingCommandOutputEmitTimer = undefined
@@ -511,7 +514,7 @@ export async function executeCommandInTerminal(
 	// Wait for onCompleted callback to finish if shell execution completed.
 	// This ensures persistedResult is set before we try to use it, fixing the race
 	// condition where exitDetails is set (sync) before the async onCompleted finishes.
-	if (exitDetails && onCompletedPromise) {
+	if ((exitDetails || isCompletedTriggered) && onCompletedPromise) {
 		await onCompletedPromise
 	}
 

src/integrations/terminal/Terminal.ts

@@ -15,6 +15,8 @@ export class Terminal extends BaseTerminal {
 
 	public cmdCounter: number = 0
 
+	private isFirstCommand: boolean = true
+
 	public activeShellExecution?: vscode.TerminalShellExecution
 
 	constructor(id: number, terminal: vscode.Terminal | undefined, cwd: string) {
@@ -121,10 +123,17 @@ export class Terminal extends BaseTerminal {
 				pWaitFor(() => this.terminal.shellIntegration !== undefined, {
 					timeout: Terminal.getShellIntegrationTimeout(),
 				})
-					.then(() => {
+					.then(async () => {
 						// Clean up temporary directory if shell integration is available, zsh did its job:
 						ShellIntegrationManager.zshCleanupTmpDir(this.id)
 
+						// If this is a newly created terminal, give VS Code's shell integration script
+						// a brief moment to finish activating in the PTY before submitting the command.
+						if (this.isFirstCommand) {
+							this.isFirstCommand = false
+							await new Promise((resolve) => setTimeout(resolve, 1000))
+						}
+
 						// Run the command in the terminal
 						process.run(command)
 					})