feat: change default command execution timeout to 0 (no timeout)

- Change default commandExecutionTimeout from 30000ms to 0 (no timeout)
- Update minimum value from 1000ms to 0ms in package.json
- Update package.nls.json description to clarify 0 = no timeout
- Modify executeCommandTool.ts to skip timeout logic when timeout is 0
- Update tests to reflect new default behavior and add test for no timeout
- Timeout functionality works for both VSCode terminal and execa execution

Addresses @mrubens feedback in PR #5668

Author: roomote

src/core/tools/__tests__/executeCommandTimeout.integration.spec.ts

@@ -58,7 +58,7 @@ describe("Command Execution Timeout Integration", () => {
 
 		// Mock VSCode configuration
 		const mockGetConfiguration = vitest.fn().mockReturnValue({
-			get: vitest.fn().mockReturnValue(30000), // Default 30 second timeout
+			get: vitest.fn().mockReturnValue(0), // Default 0 (no timeout)
 		})
 		;(vscode.workspace.getConfiguration as any).mockReturnValue(mockGetConfiguration())
 	})
@@ -149,19 +149,40 @@ describe("Command Execution Timeout Integration", () => {
 		expect(result[1]).not.toContain("timed out")
 	})
 
-	it("should use default timeout when not specified", async () => {
+	it("should use default timeout when not specified (0 = no timeout)", async () => {
 		const options: ExecuteCommandOptions = {
 			executionId: "test-execution",
 			command: "echo test",
-			// commandExecutionTimeout not specified, should use default
+			// commandExecutionTimeout not specified, should use default (0)
 		}
 
 		const quickProcess = Promise.resolve()
 		mockTerminal.runCommand.mockReturnValue(quickProcess)
 
 		await executeCommand(mockTask as Task, options)
 
-		// Should complete without issues using default timeout
+		// Should complete without issues using default (no timeout)
 		expect(mockTerminal.runCommand).toHaveBeenCalled()
 	})
+
+	it("should not timeout when commandExecutionTimeout is 0", async () => {
+		const options: ExecuteCommandOptions = {
+			executionId: "test-execution",
+			command: "sleep 10",
+			commandExecutionTimeout: 0, // No timeout
+		}
+
+		// Create a process that resolves after a delay to simulate a long-running command
+		const longRunningProcess = new Promise((resolve) => {
+			setTimeout(resolve, 200) // 200ms delay
+		})
+
+		mockTerminal.runCommand.mockReturnValue(longRunningProcess)
+
+		const result = await executeCommand(mockTask as Task, options)
+
+		// Should complete successfully without timeout
+		expect(result[0]).toBe(false) // Not rejected
+		expect(result[1]).not.toContain("timed out")
+	})
 })

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

@@ -298,7 +298,7 @@ describe("executeCommandTool", () => {
 				customCwd: undefined,
 				terminalShellIntegrationDisabled: false,
 				terminalOutputLineLimit: 500,
-				commandExecutionTimeout: 30000,
+				commandExecutionTimeout: 0,
 			}
 
 			// Verify all required properties exist

src/core/tools/executeCommandTool.ts

@@ -67,7 +67,7 @@ export async function executeCommandTool(
 			// Get command execution timeout from VSCode configuration
 			const commandExecutionTimeout = vscode.workspace
 				.getConfiguration(Package.name)
-				.get<number>("commandExecutionTimeout", 30000)
+				.get<number>("commandExecutionTimeout", 0)
 
 			const options: ExecuteCommandOptions = {
 				executionId,
@@ -132,7 +132,7 @@ export async function executeCommand(
 		customCwd,
 		terminalShellIntegrationDisabled = false,
 		terminalOutputLineLimit = 500,
-		commandExecutionTimeout = 30000,
+		commandExecutionTimeout = 0,
 	}: ExecuteCommandOptions,
 ): Promise<[boolean, ToolResponse]> {
 	let workingDir: string
@@ -221,42 +221,51 @@ export async function executeCommand(
 	const process = terminal.runCommand(command, callbacks)
 	cline.terminalProcess = process
 
-	// Implement command execution timeout
-	let timeoutId: NodeJS.Timeout | undefined
-	let isTimedOut = false
-
-	const timeoutPromise = new Promise<void>((_, reject) => {
-		timeoutId = setTimeout(() => {
-			isTimedOut = true
-			// Try to abort the process
-			if (cline.terminalProcess) {
-				cline.terminalProcess.abort()
-			}
-			reject(new Error(`Command execution timed out after ${commandExecutionTimeout}ms`))
-		}, commandExecutionTimeout)
-	})
+	// Implement command execution timeout (skip if timeout is 0)
+	if (commandExecutionTimeout > 0) {
+		let timeoutId: NodeJS.Timeout | undefined
+		let isTimedOut = false
+
+		const timeoutPromise = new Promise<void>((_, reject) => {
+			timeoutId = setTimeout(() => {
+				isTimedOut = true
+				// Try to abort the process
+				if (cline.terminalProcess) {
+					cline.terminalProcess.abort()
+				}
+				reject(new Error(`Command execution timed out after ${commandExecutionTimeout}ms`))
+			}, commandExecutionTimeout)
+		})
+
+		try {
+			await Promise.race([process, timeoutPromise])
+		} catch (error) {
+			if (isTimedOut) {
+				// Handle timeout case
+				const status: CommandExecutionStatus = { executionId, status: "timeout" }
+				clineProvider?.postMessageToWebview({ type: "commandExecutionStatus", text: JSON.stringify(status) })
 
-	try {
-		await Promise.race([process, timeoutPromise])
-	} catch (error) {
-		if (isTimedOut) {
-			// Handle timeout case
-			const status: CommandExecutionStatus = { executionId, status: "timeout" }
-			clineProvider?.postMessageToWebview({ type: "commandExecutionStatus", text: JSON.stringify(status) })
+				cline.terminalProcess = undefined
 
+				return [
+					false,
+					`Command execution timed out after ${commandExecutionTimeout}ms. The command was terminated.`,
+				]
+			}
+			throw error
+		} finally {
+			if (timeoutId) {
+				clearTimeout(timeoutId)
+			}
 			cline.terminalProcess = undefined
-
-			return [
-				false,
-				`Command execution timed out after ${commandExecutionTimeout}ms. The command was terminated.`,
-			]
 		}
-		throw error
-	} finally {
-		if (timeoutId) {
-			clearTimeout(timeoutId)
+	} else {
+		// No timeout - just wait for the process to complete
+		try {
+			await process
+		} finally {
+			cline.terminalProcess = undefined
 		}
-		cline.terminalProcess = undefined
 	}
 
 	if (shellIntegrationError) {

src/package.json

@@ -340,8 +340,8 @@
 				},
 				"roo-cline.commandExecutionTimeout": {
 					"type": "number",
-					"default": 30000,
-					"minimum": 1000,
+					"default": 0,
+					"minimum": 0,
 					"maximum": 300000,
 					"description": "%commands.commandExecutionTimeout.description%"
 				},

src/package.nls.json

@@ -28,7 +28,7 @@
 	"configuration.title": "Roo Code",
 	"commands.allowedCommands.description": "Commands that can be auto-executed when 'Always approve execute operations' is enabled",
 	"commands.deniedCommands.description": "Command prefixes that will be automatically denied without asking for approval. In case of conflicts with allowed commands, the longest prefix match takes precedence. Add * to deny all commands.",
-	"commands.commandExecutionTimeout.description": "Maximum time in milliseconds to wait for command execution to complete before timing out (1000-300000ms, default: 30000ms)",
+	"commands.commandExecutionTimeout.description": "Maximum time in milliseconds to wait for command execution to complete before timing out (0 = no timeout, 1000-300000ms, default: 0ms)",
 	"settings.vsCodeLmModelSelector.description": "Settings for VSCode Language Model API",
 	"settings.vsCodeLmModelSelector.vendor.description": "The vendor of the language model (e.g. copilot)",
 	"settings.vsCodeLmModelSelector.family.description": "The family of the language model (e.g. gpt-4)",