fix: clear ZSH EOL mark to prevent command output interpretation issues

Added a new configuration option 'terminalZshClearEolMark' (default: true) that
sets PROMPT_EOL_MARK='' in the terminal environment. This prevents issues with
command output interpretation when the output ends with special characters like '%'.

Added translations for all supported languages.

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

Author: Eric Wheeler

src/core/webview/ClineProvider.ts

@@ -351,11 +351,23 @@ 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, terminalCommandDelay }) => {
-			setSoundEnabled(soundEnabled ?? false)
-			Terminal.setShellIntegrationTimeout(terminalShellIntegrationTimeout ?? TERMINAL_SHELL_INTEGRATION_TIMEOUT)
-			Terminal.setCommandDelay(terminalCommandDelay ?? 0)
-		})
+		this.getState().then(
+			({
+				soundEnabled,
+				terminalShellIntegrationTimeout,
+				terminalCommandDelay,
+				terminalZshClearEolMark,
+				terminalPowershellCounter,
+			}) => {
+				setSoundEnabled(soundEnabled ?? false)
+				Terminal.setShellIntegrationTimeout(
+					terminalShellIntegrationTimeout ?? TERMINAL_SHELL_INTEGRATION_TIMEOUT,
+				)
+				Terminal.setCommandDelay(terminalCommandDelay ?? 0)
+				Terminal.setTerminalZshClearEolMark(terminalZshClearEolMark ?? true)
+				Terminal.setPowershellCounter(terminalPowershellCounter ?? false)
+			},
+		)
 
 		// Initialize tts enabled state
 		this.getState().then(({ ttsEnabled }) => {
@@ -1200,6 +1212,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			terminalShellIntegrationTimeout,
 			terminalCommandDelay,
 			terminalPowershellCounter,
+			terminalZshClearEolMark,
 			fuzzyMatchThreshold,
 			mcpEnabled,
 			enableMcpServerCreation,
@@ -1269,6 +1282,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			terminalShellIntegrationTimeout: terminalShellIntegrationTimeout ?? TERMINAL_SHELL_INTEGRATION_TIMEOUT,
 			terminalCommandDelay: terminalCommandDelay ?? 0,
 			terminalPowershellCounter: terminalPowershellCounter ?? false,
+			terminalZshClearEolMark: terminalZshClearEolMark ?? true,
 			fuzzyMatchThreshold: fuzzyMatchThreshold ?? 1.0,
 			mcpEnabled: mcpEnabled ?? true,
 			enableMcpServerCreation: enableMcpServerCreation ?? true,
@@ -1357,6 +1371,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 				stateValues.terminalShellIntegrationTimeout ?? TERMINAL_SHELL_INTEGRATION_TIMEOUT,
 			terminalCommandDelay: stateValues.terminalCommandDelay ?? 0,
 			terminalPowershellCounter: stateValues.terminalPowershellCounter ?? false,
+			terminalZshClearEolMark: stateValues.terminalZshClearEolMark ?? true,
 			mode: stateValues.mode ?? defaultModeSlug,
 			language: stateValues.language ?? formatLanguage(vscode.env.language),
 			mcpEnabled: stateValues.mcpEnabled ?? true,

src/core/webview/webviewMessageHandler.ts

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

src/exports/roo-code.d.ts

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

src/exports/types.ts

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

src/integrations/terminal/Terminal.ts

@@ -9,6 +9,7 @@ export class Terminal {
 	private static shellIntegrationTimeout: number = TERMINAL_SHELL_INTEGRATION_TIMEOUT
 	private static commandDelay: number = 0
 	private static powershellCounter: boolean = false
+	private static terminalZshClearEolMark: boolean = true
 
 	public terminal: vscode.Terminal
 	public busy: boolean
@@ -294,6 +295,22 @@ export class Terminal {
 		return Terminal.powershellCounter
 	}
 
+	/**
+	 * Sets whether to clear the ZSH EOL mark
+	 * @param enabled Whether to clear the ZSH EOL mark
+	 */
+	public static setTerminalZshClearEolMark(enabled: boolean): void {
+		Terminal.terminalZshClearEolMark = enabled
+	}
+
+	/**
+	 * Gets whether to clear the ZSH EOL mark
+	 * @returns Whether the ZSH EOL mark clearing is enabled
+	 */
+	public static getTerminalZshClearEolMark(): boolean {
+		return Terminal.terminalZshClearEolMark
+	}
+
 	public static compressTerminalOutput(input: string, lineLimit: number): string {
 		return truncateOutput(applyRunLengthEncoding(input), lineLimit)
 	}

src/integrations/terminal/TerminalRegistry.ts

@@ -125,6 +125,12 @@ export class TerminalRegistry {
 			env.PROMPT_COMMAND = `sleep ${Terminal.getCommandDelay() / 1000}`
 		}
 
+		// Clear the ZSH EOL mark to prevent issues with command output interpretation
+		// when output ends with special characters like '%'
+		if (Terminal.getTerminalZshClearEolMark()) {
+			env.PROMPT_EOL_MARK = ""
+		}
+
 		const terminal = vscode.window.createTerminal({
 			cwd,
 			name: "Roo Code",

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

@@ -33,6 +33,7 @@ describe("TerminalRegistry", () => {
 				env: {
 					PAGER: "cat",
 					VTE_VERSION: "0",
+					PROMPT_EOL_MARK: "",
 				},
 			})
 		})
@@ -53,6 +54,7 @@ describe("TerminalRegistry", () => {
 						PAGER: "cat",
 						PROMPT_COMMAND: "sleep 0.05",
 						VTE_VERSION: "0",
+						PROMPT_EOL_MARK: "",
 					},
 				})
 			} finally {

src/schemas/index.ts

@@ -534,6 +534,7 @@ export const globalSettingsSchema = z.object({
 	terminalShellIntegrationTimeout: z.number().optional(),
 	terminalCommandDelay: z.number().optional(),
 	terminalPowershellCounter: z.boolean().optional(),
+	terminalZshClearEolMark: z.boolean().optional(),
 
 	rateLimitSeconds: z.number().optional(),
 	diffEnabled: z.boolean().optional(),
@@ -606,6 +607,7 @@ const globalSettingsRecord: GlobalSettingsRecord = {
 	terminalShellIntegrationTimeout: undefined,
 	terminalCommandDelay: undefined,
 	terminalPowershellCounter: undefined,
+	terminalZshClearEolMark: undefined,
 
 	rateLimitSeconds: undefined,
 	diffEnabled: undefined,

src/shared/ExtensionMessage.ts

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

src/shared/WebviewMessage.ts

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