fix(terminal): skip ZDOTDIR injection with profile override; clear cached profile on picker open

Author: edelauna

src/integrations/terminal/__tests__/TerminalProcessExec.bash.spec.ts

@@ -37,6 +37,7 @@ vi.mock("vscode", () => {
 				eventHandlers.closeTerminal = handler
 				return { dispose: vi.fn() }
 			}),
+			onDidChangeTerminalShellIntegration: vi.fn().mockReturnValue({ dispose: vi.fn() }),
 		},
 		ThemeIcon: class ThemeIcon {
 			constructor(id: string) {
@@ -92,7 +93,7 @@ function createRealCommandStream(command: string): { stream: AsyncIterable<strin
 				exitCode = 1
 			}
 		} else {
-			exitCode = error.status || 1 // Use status if available, default to 1
+			exitCode = error.status ?? 1 // Use status if available, default to 1
 		}
 	}
 

src/integrations/terminal/__tests__/TerminalProcessExec.cmd.spec.ts

@@ -42,6 +42,7 @@ vi.mock("vscode", () => {
 				eventHandlers.closeTerminal = handler
 				return { dispose: vi.fn() }
 			}),
+			onDidChangeTerminalShellIntegration: vi.fn().mockReturnValue({ dispose: vi.fn() }),
 		},
 		ThemeIcon: class ThemeIcon {
 			constructor(id: string) {

src/integrations/terminal/__tests__/TerminalProcessExec.pwsh.spec.ts

@@ -42,6 +42,7 @@ vi.mock("vscode", () => {
 				eventHandlers.closeTerminal = handler
 				return { dispose: vi.fn() }
 			}),
+			onDidChangeTerminalShellIntegration: vi.fn().mockReturnValue({ dispose: vi.fn() }),
 		},
 		ThemeIcon: class ThemeIcon {
 			constructor(id: string) {

src/integrations/terminal/__tests__/TerminalProfile.spec.ts

@@ -6,6 +6,7 @@ import * as vscode from "vscode"
 
 import { Terminal } from "../Terminal"
 import { TerminalRegistry } from "../TerminalRegistry"
+import { ShellIntegrationManager } from "../ShellIntegrationManager"
 
 vi.mock("execa", () => ({
 	execa: vi.fn(),
@@ -127,6 +128,102 @@ describe("Terminal VS Code terminal profile (#277)", () => {
 
 			expect(Terminal.getAvailableProfileNames("linux")).toEqual(["bash", "zsh"])
 		})
+
+		it("excludes cmd.exe profiles on Windows (shell integration unsupported)", () => {
+			stubProfiles({
+				windows: {
+					"Command Prompt": { path: "C:\\Windows\\System32\\cmd.exe" },
+					PowerShell: { path: "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" },
+				},
+			})
+
+			expect(Terminal.getAvailableProfileNames("win32")).toEqual(["PowerShell"])
+		})
+
+		describe("isCmdExe", () => {
+			it.each([
+				["C:\\Windows\\System32\\cmd.exe", true],
+				["C:\\WINDOWS\\SYSTEM32\\CMD.EXE", true],
+				["/mnt/c/Windows/System32/cmd.exe", true],
+				["/bin/bash", false],
+				["pwsh.exe", false],
+				["cmd", false],
+			])("isCmdExe(%s) === %s", (input, expected) => {
+				expect(Terminal.isCmdExe(input)).toBe(expected)
+			})
+		})
+
+		describe("isActiveShellCmdExe", () => {
+			it("returns false on non-Windows platforms", () => {
+				expect(Terminal.isActiveShellCmdExe("linux")).toBe(false)
+				expect(Terminal.isActiveShellCmdExe("darwin")).toBe(false)
+			})
+
+			it("returns true when profile override resolves to cmd.exe", () => {
+				stubProfiles({ windows: { "Command Prompt": { path: "C:\\Windows\\System32\\cmd.exe" } } })
+				Terminal.setTerminalProfile("Command Prompt")
+				expect(Terminal.isActiveShellCmdExe("win32")).toBe(true)
+			})
+
+			it("returns false when profile override resolves to a non-cmd shell", () => {
+				stubProfiles({ windows: { PowerShell: { path: "C:\\Program Files\\PowerShell\\pwsh.exe" } } })
+				Terminal.setTerminalProfile("PowerShell")
+				expect(Terminal.isActiveShellCmdExe("win32")).toBe(false)
+			})
+
+			it("returns true when no override and default profile is cmd.exe", () => {
+				Terminal.setTerminalProfile(undefined)
+				stubProfiles({ windows: { "Command Prompt": { path: "C:\\Windows\\System32\\cmd.exe" } } })
+				getConfigurationSpy = vi
+					.spyOn(vscode.workspace, "getConfiguration")
+					.mockImplementation((section?: string) => {
+						if (section === "terminal.integrated.profiles") {
+							return {
+								inspect: (_key: string) => ({
+									defaultValue: { "Command Prompt": { path: "C:\\Windows\\System32\\cmd.exe" } },
+									globalValue: undefined,
+								}),
+							} as any
+						}
+						if (section === "terminal.integrated") {
+							return {
+								get: (key: string) => (key === "defaultProfile.windows" ? "Command Prompt" : undefined),
+							} as any
+						}
+						return { get: (_key: string, defaultValue?: unknown) => defaultValue } as any
+					})
+				expect(Terminal.isActiveShellCmdExe("win32")).toBe(true)
+			})
+
+			it("returns false when no override and default profile is PowerShell", () => {
+				Terminal.setTerminalProfile(undefined)
+				getConfigurationSpy = vi
+					.spyOn(vscode.workspace, "getConfiguration")
+					.mockImplementation((section?: string) => {
+						if (section === "terminal.integrated.profiles") {
+							return {
+								inspect: (_key: string) => ({
+									defaultValue: { PowerShell: { path: "C:\\Program Files\\PowerShell\\pwsh.exe" } },
+									globalValue: undefined,
+								}),
+							} as any
+						}
+						if (section === "terminal.integrated") {
+							return {
+								get: (key: string) => (key === "defaultProfile.windows" ? "PowerShell" : undefined),
+							} as any
+						}
+						return { get: (_key: string, defaultValue?: unknown) => defaultValue } as any
+					})
+				expect(Terminal.isActiveShellCmdExe("win32")).toBe(false)
+			})
+
+			it("returns false when no override and no default profile configured", () => {
+				Terminal.setTerminalProfile(undefined)
+				stubProfiles({})
+				expect(Terminal.isActiveShellCmdExe("win32")).toBe(false)
+			})
+		})
 	})
 
 	describe("getProfileShell", () => {
@@ -328,4 +425,41 @@ describe("Terminal VS Code terminal profile (#277)", () => {
 			expect(options.shellArgs).toBeUndefined()
 		})
 	})
+
+	describe("ZDOTDIR injection guard", () => {
+		let zshInitTmpDirSpy: any
+
+		beforeEach(() => {
+			zshInitTmpDirSpy = vi
+				.spyOn(ShellIntegrationManager, "zshInitTmpDir")
+				.mockReturnValue("/tmp/roo-zdotdir-test")
+			Terminal.setTerminalZdotdir(true)
+		})
+
+		afterEach(() => {
+			Terminal.setTerminalZdotdir(false)
+			Terminal.setTerminalProfile(undefined)
+			TerminalRegistry["terminals"] = []
+			vi.restoreAllMocks()
+		})
+
+		it("sets ZDOTDIR when zdotdir is enabled and no profile is configured", () => {
+			stubProfiles({})
+			const env = Terminal.getEnv()
+			expect(zshInitTmpDirSpy).toHaveBeenCalledTimes(1)
+			expect(env.ZDOTDIR).toBe("/tmp/roo-zdotdir-test")
+		})
+
+		it("skips ZDOTDIR when zdotdir is enabled but a profile is configured", () => {
+			stubProfiles({
+				[Terminal.getPlatformProfileKey(process.platform)]: {
+					zsh: { path: "/bin/zsh" },
+				},
+			})
+			Terminal.setTerminalProfile("zsh")
+			const env = Terminal.getEnv()
+			expect(zshInitTmpDirSpy).not.toHaveBeenCalled()
+			expect(env.ZDOTDIR).toBeUndefined()
+		})
+	})
 })

src/integrations/terminal/__tests__/streamUtils/bashStream.ts

@@ -40,7 +40,7 @@ export function createBashCommandStream(command: string): CommandStream {
 				exitCode = 1
 			}
 		} else {
-			exitCode = error.status || 1 // Use status if available, default to 1
+			exitCode = error.status ?? 1 // Use status if available, default to 1
 		}
 	}
 

src/integrations/terminal/__tests__/streamUtils/cmdStream.ts

@@ -25,7 +25,7 @@ export function createCmdCommandStream(command: string): CommandStream {
 	} catch (error: any) {
 		// Command failed - get output and exit code from error
 		realOutput = error.stdout?.toString() || ""
-		exitCode = error.status || 1
+		exitCode = error.status ?? 1
 	}
 
 	// Create an async iterator for the stream

src/integrations/terminal/__tests__/streamUtils/pwshStream.ts

@@ -38,11 +38,11 @@ export function createPowerShellStream(command: string): CommandStream {
 	} catch (error: any) {
 		// Command failed - get output and exit code from error
 		realOutput = error.stdout?.toString() || ""
-		console.error(`PowerShell command failed with status ${error.status || "unknown"}:`, error.message)
+		console.error(`PowerShell command failed with status ${error.status ?? "unknown"}:`, error.message)
 		if (error.stderr) {
 			console.error(`stderr: ${error.stderr.toString()}`)
 		}
-		exitCode = error.status || 1
+		exitCode = error.status ?? 1
 	}
 
 	// Create an async iterator for the stream

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

@@ -192,6 +192,7 @@ export const TerminalSettings = ({
 										appearance="secondary"
 										onClick={() => {
 											onTerminalProfilePickerOpened?.()
+											setCachedStateField("terminalProfile", undefined)
 											vscode.postMessage({ type: "openTerminalProfilePicker" })
 										}}
 										data-testid="terminal-profile-configure-button">