feat: add terminalPowershellCounter configuration option

Add a new configuration option that allows users to toggle the PowerShell counter workaround. This workaround adds a counter to PowerShell commands to ensure proper command execution and output capture.

The setting is disabled by default, allowing users to enable it only when needed.

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

Author: Eric Wheeler

src/core/webview/ClineProvider.ts

@@ -1199,6 +1199,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			terminalOutputLineLimit,
 			terminalShellIntegrationTimeout,
 			terminalCommandDelay,
+			terminalPowershellCounter,
 			fuzzyMatchThreshold,
 			mcpEnabled,
 			enableMcpServerCreation,
@@ -1267,6 +1268,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			terminalOutputLineLimit: terminalOutputLineLimit ?? 500,
 			terminalShellIntegrationTimeout: terminalShellIntegrationTimeout ?? TERMINAL_SHELL_INTEGRATION_TIMEOUT,
 			terminalCommandDelay: terminalCommandDelay ?? 0,
+			terminalPowershellCounter: terminalPowershellCounter ?? false,
 			fuzzyMatchThreshold: fuzzyMatchThreshold ?? 1.0,
 			mcpEnabled: mcpEnabled ?? true,
 			enableMcpServerCreation: enableMcpServerCreation ?? true,
@@ -1354,6 +1356,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			terminalShellIntegrationTimeout:
 				stateValues.terminalShellIntegrationTimeout ?? TERMINAL_SHELL_INTEGRATION_TIMEOUT,
 			terminalCommandDelay: stateValues.terminalCommandDelay ?? 0,
+			terminalPowershellCounter: stateValues.terminalPowershellCounter ?? false,
 			mode: stateValues.mode ?? defaultModeSlug,
 			language: stateValues.language ?? formatLanguage(vscode.env.language),
 			mcpEnabled: stateValues.mcpEnabled ?? true,

src/core/webview/webviewMessageHandler.ts

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

src/exports/roo-code.d.ts

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

src/exports/types.ts

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

src/integrations/terminal/Terminal.ts

@@ -8,6 +8,7 @@ export const TERMINAL_SHELL_INTEGRATION_TIMEOUT = 5000
 export class Terminal {
 	private static shellIntegrationTimeout: number = TERMINAL_SHELL_INTEGRATION_TIMEOUT
 	private static commandDelay: number = 0
+	private static powershellCounter: boolean = false
 
 	public terminal: vscode.Terminal
 	public busy: boolean
@@ -277,6 +278,22 @@ export class Terminal {
 		return Terminal.commandDelay
 	}
 
+	/**
+	 * Sets whether to use the PowerShell counter workaround
+	 * @param enabled Whether to enable the PowerShell counter workaround
+	 */
+	public static setPowershellCounter(enabled: boolean): void {
+		Terminal.powershellCounter = enabled
+	}
+
+	/**
+	 * Gets whether to use the PowerShell counter workaround
+	 * @returns Whether the PowerShell counter workaround is enabled
+	 */
+	public static getPowershellCounter(): boolean {
+		return Terminal.powershellCounter
+	}
+
 	public static compressTerminalOutput(input: string, lineLimit: number): string {
 		return truncateOutput(applyRunLengthEncoding(input), lineLimit)
 	}

src/integrations/terminal/TerminalProcess.ts

@@ -290,11 +290,16 @@ export class TerminalProcess extends EventEmitter<TerminalProcessEvents> {
 				(defaultWindowsShellProfile === null ||
 					(defaultWindowsShellProfile as string)?.toLowerCase().includes("powershell"))
 			if (isPowerShell) {
-				let commandToExecute = `${command} ; "(Roo/PS Workaround: ${this.terminalInfo.cmdCounter++})" > $null`
+				let commandToExecute = command
+
+				// Only add the PowerShell counter workaround if enabled
+				if (Terminal.getPowershellCounter()) {
+					commandToExecute += ` ; "(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()}`
+					commandToExecute += ` ; start-sleep -milliseconds ${Terminal.getCommandDelay()}`
 				}
 
 				terminal.shellIntegration.executeCommand(commandToExecute)

src/schemas/index.ts

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

src/shared/ExtensionMessage.ts

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

src/shared/WebviewMessage.ts

@@ -83,6 +83,7 @@ export interface WebviewMessage {
 		| "terminalOutputLineLimit"
 		| "terminalShellIntegrationTimeout"
 		| "terminalCommandDelay"
+		| "terminalPowershellCounter"
 		| "mcpEnabled"
 		| "enableMcpServerCreation"
 		| "searchCommits"

webview-ui/src/components/settings/SettingsView.tsx

@@ -130,6 +130,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 		terminalOutputLineLimit,
 		terminalShellIntegrationTimeout,
 		terminalCommandDelay,
+		terminalPowershellCounter,
 		writeDelayMs,
 		showRooIgnoredFiles,
 		remoteBrowserEnabled,
@@ -239,6 +240,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 			vscode.postMessage({ type: "terminalOutputLineLimit", value: terminalOutputLineLimit ?? 500 })
 			vscode.postMessage({ type: "terminalShellIntegrationTimeout", value: terminalShellIntegrationTimeout })
 			vscode.postMessage({ type: "terminalCommandDelay", value: terminalCommandDelay })
+			vscode.postMessage({ type: "terminalPowershellCounter", bool: terminalPowershellCounter })
 			vscode.postMessage({ type: "mcpEnabled", bool: mcpEnabled })
 			vscode.postMessage({ type: "alwaysApproveResubmit", bool: alwaysApproveResubmit })
 			vscode.postMessage({ type: "requestDelaySeconds", value: requestDelaySeconds })
@@ -484,6 +486,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 						terminalOutputLineLimit={terminalOutputLineLimit}
 						terminalShellIntegrationTimeout={terminalShellIntegrationTimeout}
 						terminalCommandDelay={terminalCommandDelay}
+						terminalPowershellCounter={terminalPowershellCounter}
 						setCachedStateField={setCachedStateField}
 					/>
 				</div>