feat: add terminal.commandDelay setting

Add a new configurable setting to control command execution delays in terminals.
When set to a non-zero value, this adds a sleep delay after command execution
via PROMPT_COMMAND in bash/zsh and start-sleep in PowerShell.

The default value is 0, which disables the delay completely. This setting
replaces the previous hardcoded delay of 50ms that was added as a workaround
for VSCode bug #237208.

Fixes: #2017
Signed-off-by: Eric Wheeler <[email protected]>

Author: Eric Wheeler

src/core/webview/ClineProvider.ts

@@ -351,9 +351,10 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 		}
 
 		// Initialize out-of-scope variables that need to recieve persistent global state values
-		this.getState().then(({ soundEnabled, terminalShellIntegrationTimeout }) => {
+		this.getState().then(({ soundEnabled, terminalShellIntegrationTimeout, terminalCommandDelay }) => {
 			setSoundEnabled(soundEnabled ?? false)
 			Terminal.setShellIntegrationTimeout(terminalShellIntegrationTimeout ?? TERMINAL_SHELL_INTEGRATION_TIMEOUT)
+			Terminal.setCommandDelay(terminalCommandDelay ?? 0)
 		})
 
 		// Initialize tts enabled state
@@ -1197,6 +1198,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			writeDelayMs,
 			terminalOutputLineLimit,
 			terminalShellIntegrationTimeout,
+			terminalCommandDelay,
 			fuzzyMatchThreshold,
 			mcpEnabled,
 			enableMcpServerCreation,
@@ -1264,6 +1266,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			writeDelayMs: writeDelayMs ?? 1000,
 			terminalOutputLineLimit: terminalOutputLineLimit ?? 500,
 			terminalShellIntegrationTimeout: terminalShellIntegrationTimeout ?? TERMINAL_SHELL_INTEGRATION_TIMEOUT,
+			terminalCommandDelay: terminalCommandDelay ?? 0,
 			fuzzyMatchThreshold: fuzzyMatchThreshold ?? 1.0,
 			mcpEnabled: mcpEnabled ?? true,
 			enableMcpServerCreation: enableMcpServerCreation ?? true,
@@ -1350,6 +1353,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			terminalOutputLineLimit: stateValues.terminalOutputLineLimit ?? 500,
 			terminalShellIntegrationTimeout:
 				stateValues.terminalShellIntegrationTimeout ?? TERMINAL_SHELL_INTEGRATION_TIMEOUT,
+			terminalCommandDelay: stateValues.terminalCommandDelay ?? 0,
 			mode: stateValues.mode ?? defaultModeSlug,
 			language: stateValues.language ?? formatLanguage(vscode.env.language),
 			mcpEnabled: stateValues.mcpEnabled ?? true,

src/core/webview/webviewMessageHandler.ts

@@ -736,6 +736,13 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 				Terminal.setShellIntegrationTimeout(message.value)
 			}
 			break
+		case "terminalCommandDelay":
+			await updateGlobalState("terminalCommandDelay", message.value)
+			await provider.postStateToWebview()
+			if (message.value !== undefined) {
+				Terminal.setCommandDelay(message.value)
+			}
+			break
 		case "mode":
 			await provider.handleModeSwitch(message.text as Mode)
 			break

src/exports/roo-code.d.ts

@@ -266,6 +266,7 @@ type GlobalSettings = {
 	maxReadFileLine?: number | undefined
 	terminalOutputLineLimit?: number | undefined
 	terminalShellIntegrationTimeout?: number | undefined
+	terminalCommandDelay?: number | undefined
 	rateLimitSeconds?: number | undefined
 	diffEnabled?: boolean | undefined
 	fuzzyMatchThreshold?: number | undefined

src/exports/types.ts

@@ -269,6 +269,7 @@ type GlobalSettings = {
 	maxReadFileLine?: number | undefined
 	terminalOutputLineLimit?: number | undefined
 	terminalShellIntegrationTimeout?: number | undefined
+	terminalCommandDelay?: number | undefined
 	rateLimitSeconds?: number | undefined
 	diffEnabled?: boolean | undefined
 	fuzzyMatchThreshold?: number | undefined

src/integrations/terminal/Terminal.ts

@@ -7,6 +7,7 @@ export const TERMINAL_SHELL_INTEGRATION_TIMEOUT = 5000
 
 export class Terminal {
 	private static shellIntegrationTimeout: number = TERMINAL_SHELL_INTEGRATION_TIMEOUT
+	private static commandDelay: number = 0
 
 	public terminal: vscode.Terminal
 	public busy: boolean
@@ -260,6 +261,22 @@ export class Terminal {
 		return Terminal.shellIntegrationTimeout
 	}
 
+	/**
+	 * Sets the command delay in milliseconds
+	 * @param delayMs The delay in milliseconds
+	 */
+	public static setCommandDelay(delayMs: number): void {
+		Terminal.commandDelay = delayMs
+	}
+
+	/**
+	 * Gets the command delay in milliseconds
+	 * @returns The command delay in milliseconds
+	 */
+	public static getCommandDelay(): number {
+		return Terminal.commandDelay
+	}
+
 	public static compressTerminalOutput(input: string, lineLimit: number): string {
 		return truncateOutput(applyRunLengthEncoding(input), lineLimit)
 	}

src/integrations/terminal/TerminalProcess.ts

@@ -290,9 +290,14 @@ export class TerminalProcess extends EventEmitter<TerminalProcessEvents> {
 				(defaultWindowsShellProfile === null ||
 					(defaultWindowsShellProfile as string)?.toLowerCase().includes("powershell"))
 			if (isPowerShell) {
-				terminal.shellIntegration.executeCommand(
-					`${command} ; "(Roo/PS Workaround: ${this.terminalInfo.cmdCounter++})" > $null; start-sleep -milliseconds 150`,
-				)
+				let commandToExecute = `${command} ; "(Roo/PS Workaround: ${this.terminalInfo.cmdCounter++})" > $null`
+
+				// Only add the sleep command if the command delay is greater than 0
+				if (Terminal.getCommandDelay() > 0) {
+					commandToExecute += `; start-sleep -milliseconds ${Terminal.getCommandDelay()}`
+				}
+
+				terminal.shellIntegration.executeCommand(commandToExecute)
 			} else {
 				terminal.shellIntegration.executeCommand(command)
 			}

src/integrations/terminal/TerminalRegistry.ts

@@ -109,22 +109,27 @@ export class TerminalRegistry {
 	}
 
 	static createTerminal(cwd: string | vscode.Uri): Terminal {
+		const env: Record<string, string> = {
+			PAGER: "cat",
+
+			// VTE must be disabled because it prevents the prompt command from executing
+			// See https://wiki.gnome.org/Apps/Terminal/VTE
+			VTE_VERSION: "0",
+		}
+
+		// VSCode bug#237208: Command output can be lost due to a race between completion
+		// sequences and consumers. Add delay via PROMPT_COMMAND to ensure the
+		// \x1b]633;D escape sequence arrives after command output is processed.
+		// Only add this if commandDelay is not zero
+		if (Terminal.getCommandDelay() > 0) {
+			env.PROMPT_COMMAND = `sleep ${Terminal.getCommandDelay() / 1000}`
+		}
+
 		const terminal = vscode.window.createTerminal({
 			cwd,
 			name: "Roo Code",
 			iconPath: new vscode.ThemeIcon("rocket"),
-			env: {
-				PAGER: "cat",
-
-				// VSCode bug#237208: Command output can be lost due to a race between completion
-				// sequences and consumers. Add 50ms delay via PROMPT_COMMAND to ensure the
-				// \x1b]633;D escape sequence arrives after command output is processed.
-				PROMPT_COMMAND: "sleep 0.050",
-
-				// VTE must be disabled because it prevents the prompt command above from executing
-				// See https://wiki.gnome.org/Apps/Terminal/VTE
-				VTE_VERSION: "0",
-			},
+			env,
 		})
 
 		const cwdString = cwd.toString()

src/integrations/terminal/__tests__/TerminalRegistry.test.ts

@@ -1,5 +1,6 @@
 // npx jest src/integrations/terminal/__tests__/TerminalRegistry.test.ts
 
+import { Terminal } from "../Terminal"
 import { TerminalRegistry } from "../TerminalRegistry"
 
 // Mock vscode.window.createTerminal
@@ -31,10 +32,33 @@ describe("TerminalRegistry", () => {
 				iconPath: expect.any(Object),
 				env: {
 					PAGER: "cat",
-					PROMPT_COMMAND: "sleep 0.050",
 					VTE_VERSION: "0",
 				},
 			})
 		})
+
+		it("adds PROMPT_COMMAND when Terminal.getCommandDelay() > 0", () => {
+			// Set command delay to 50ms for this test
+			const originalDelay = Terminal.getCommandDelay()
+			Terminal.setCommandDelay(50)
+
+			try {
+				TerminalRegistry.createTerminal("/test/path")
+
+				expect(mockCreateTerminal).toHaveBeenCalledWith({
+					cwd: "/test/path",
+					name: "Roo Code",
+					iconPath: expect.any(Object),
+					env: {
+						PAGER: "cat",
+						PROMPT_COMMAND: "sleep 0.05",
+						VTE_VERSION: "0",
+					},
+				})
+			} finally {
+				// Restore original delay
+				Terminal.setCommandDelay(originalDelay)
+			}
+		})
 	})
 })

src/schemas/index.ts

@@ -532,6 +532,7 @@ export const globalSettingsSchema = z.object({
 
 	terminalOutputLineLimit: z.number().optional(),
 	terminalShellIntegrationTimeout: z.number().optional(),
+	terminalCommandDelay: z.number().optional(),
 
 	rateLimitSeconds: z.number().optional(),
 	diffEnabled: z.boolean().optional(),
@@ -602,6 +603,7 @@ const globalSettingsRecord: GlobalSettingsRecord = {
 
 	terminalOutputLineLimit: undefined,
 	terminalShellIntegrationTimeout: undefined,
+	terminalCommandDelay: undefined,
 
 	rateLimitSeconds: undefined,
 	diffEnabled: undefined,

src/shared/ExtensionMessage.ts

@@ -153,6 +153,7 @@ export type ExtensionState = Pick<
 	// | "maxReadFileLine" // Optional in GlobalSettings, required here.
 	| "terminalOutputLineLimit"
 	| "terminalShellIntegrationTimeout"
+	| "terminalCommandDelay"
 	| "diffEnabled"
 	| "fuzzyMatchThreshold"
 	// | "experiments" // Optional in GlobalSettings, required here.