fix(terminal): retry via execa silently when shell integration fails before submission

Author: edelauna

src/core/tools/ExecuteCommandTool.ts

@@ -12,7 +12,12 @@ import { Task } from "../task/Task"
 import { ToolUse, ToolResponse } from "../../shared/tools"
 import { formatResponse } from "../prompts/responses"
 import { unescapeHtmlEntities } from "../../utils/text-normalization"
-import { ExitCodeDetails, RooTerminalCallbacks, RooTerminalProcess } from "../../integrations/terminal/types"
+import {
+	ExitCodeDetails,
+	RooTerminalCallbacks,
+	RooTerminalProcess,
+	ShellIntegrationErrorDetails,
+} from "../../integrations/terminal/types"
 import { TerminalRegistry } from "../../integrations/terminal/TerminalRegistry"
 import { Terminal } from "../../integrations/terminal/Terminal"
 import { OutputInterceptor } from "../../integrations/terminal/OutputInterceptor"
@@ -21,7 +26,18 @@ import { t } from "../../i18n"
 import { getTaskDirectoryPath } from "../../utils/storage"
 import { BaseTool, ToolCallbacks } from "./BaseTool"
 
-class ShellIntegrationError extends Error {}
+export class ShellIntegrationError extends Error {
+	constructor(
+		message: string,
+		public readonly commandSubmitted: boolean,
+	) {
+		super(message)
+	}
+}
+
+export function canRetryShellIntegrationError(error: unknown): error is ShellIntegrationError {
+	return error instanceof ShellIntegrationError && !error.commandSubmitted
+}
 
 interface ExecuteCommandParams {
 	command: string
@@ -116,14 +132,14 @@ export class ExecuteCommandTool extends BaseTool<"execute_command"> {
 
 				pushToolResult(result)
 			} catch (error: unknown) {
-				const status: CommandExecutionStatus = { executionId, status: "fallback" }
-				provider?.postMessageToWebview({ type: "commandExecutionStatus", text: JSON.stringify(status) })
-				await task.say("shell_integration_warning")
-
 				// Invalidate pending ask from first execution to prevent race condition
 				task.supersedePendingAsk()
 
-				if (error instanceof ShellIntegrationError) {
+				if (canRetryShellIntegrationError(error)) {
+					// Silent retry via execa — shell startup race, command was not submitted.
+					const status: CommandExecutionStatus = { executionId, status: "fallback" }
+					provider?.postMessageToWebview({ type: "commandExecutionStatus", text: JSON.stringify(status) })
+
 					const [rejected, result] = await executeCommandInTerminal(task, {
 						...options,
 						terminalShellIntegrationDisabled: true,
@@ -135,7 +151,16 @@ export class ExecuteCommandTool extends BaseTool<"execute_command"> {
 
 					pushToolResult(result)
 				} else {
-					pushToolResult(`Command failed to execute in terminal due to a shell integration error.`)
+					// Command was submitted but shell integration lost track of it — show warning.
+					await task.say("shell_integration_warning")
+
+					if (error instanceof ShellIntegrationError) {
+						pushToolResult(
+							"Command was submitted in the VS Code terminal, but shell integration did not report its output or completion status. Do not run the command again automatically.",
+						)
+					} else {
+						pushToolResult(`Command failed to execute in terminal due to a shell integration error.`)
+					}
 				}
 			}
 
@@ -196,12 +221,20 @@ export async function executeCommandInTerminal(
 	let result: string = ""
 	let persistedResult: PersistedCommandOutput | undefined
 	let exitDetails: ExitCodeDetails | undefined
-	let shellIntegrationError: string | undefined
+	let shellIntegrationError: ShellIntegrationError | undefined
 	let hasAskedForCommandOutput = false
 
-	const terminalProvider = terminalShellIntegrationDisabled ? "execa" : "vscode"
+	const isCmdExeFallback = !terminalShellIntegrationDisabled && Terminal.isActiveShellCmdExe()
+	const terminalProvider = terminalShellIntegrationDisabled || isCmdExeFallback ? "execa" : "vscode"
 	const provider = await task.providerRef.deref()
 
+	// cmd.exe can't use shell integration — tell the webview to expand the output
+	// panel immediately (same effect as the retry-fallback path).
+	if (isCmdExeFallback) {
+		const status: CommandExecutionStatus = { executionId, status: "fallback" }
+		provider?.postMessageToWebview({ type: "commandExecutionStatus", text: JSON.stringify(status) })
+	}
+
 	// Get global storage path for persisted output artifacts
 	const globalStoragePath = provider?.context?.globalStorageUri?.fsPath
 	let interceptor: OutputInterceptor | undefined
@@ -360,9 +393,9 @@ export async function executeCommandInTerminal(
 	}
 
 	if (terminalProvider === "vscode") {
-		callbacks.onNoShellIntegration = async (error: string) => {
+		callbacks.onNoShellIntegration = async (details: ShellIntegrationErrorDetails) => {
 			TelemetryService.instance.captureShellIntegrationError(task.taskId)
-			shellIntegrationError = error
+			shellIntegrationError = new ShellIntegrationError(details.message, details.commandSubmitted)
 		}
 	}
 
@@ -442,7 +475,7 @@ export async function executeCommandInTerminal(
 	}
 
 	if (shellIntegrationError) {
-		throw new ShellIntegrationError(shellIntegrationError)
+		throw shellIntegrationError
 	}
 
 	// Wait for a short delay to ensure all messages are sent to the webview.

src/core/tools/__tests__/executeCommandTool.spec.ts

@@ -256,6 +256,18 @@ describe("executeCommandTool", () => {
 			expect(mockAskApproval).not.toHaveBeenCalled()
 			// executeCommandInTerminal should not be called since rooignore blocked it
 		})
+
+		it("allows Execa retry when shell integration fails before command submission", () => {
+			const error = new executeCommandModule.ShellIntegrationError("startup failed", false)
+
+			expect(executeCommandModule.canRetryShellIntegrationError(error)).toBe(true)
+		})
+
+		it("prevents Execa retry when shell integration fails after command submission", () => {
+			const error = new executeCommandModule.ShellIntegrationError("stream missing", true)
+
+			expect(executeCommandModule.canRetryShellIntegrationError(error)).toBe(false)
+		})
 	})
 
 	describe("Command execution timeout configuration", () => {