feat(terminal): support selecting different profile

packages/types/src/global-settings.ts

@@ -153,6 +153,7 @@ export const globalSettingsSchema = z.object({
 	terminalZshP10k: z.boolean().optional(),
 	terminalZdotdir: z.boolean().optional(),
 	terminalCompressProgressBar: z.boolean().optional(),
+	terminalPreferredProfile: z.string().optional(),
 
 	diagnosticsEnabled: z.boolean().optional(),
 

src/core/webview/ClineProvider.ts

@@ -755,6 +755,7 @@ export class ClineProvider
 				terminalZshP10k = false,
 				terminalPowershellCounter = false,
 				terminalZdotdir = false,
+				terminalPreferredProfile,
 			}) => {
 				Terminal.setShellIntegrationTimeout(terminalShellIntegrationTimeout)
 				Terminal.setShellIntegrationDisabled(terminalShellIntegrationDisabled)
@@ -764,6 +765,7 @@ export class ClineProvider
 				Terminal.setTerminalZshP10k(terminalZshP10k)
 				Terminal.setPowershellCounter(terminalPowershellCounter)
 				Terminal.setTerminalZdotdir(terminalZdotdir)
+				Terminal.setTerminalPreferredProfile(terminalPreferredProfile)
 			},
 		)
 
@@ -1813,6 +1815,7 @@ export class ClineProvider
 			terminalZshOhMy,
 			terminalZshP10k,
 			terminalZdotdir,
+			terminalPreferredProfile,
 			fuzzyMatchThreshold,
 			mcpEnabled,
 			enableMcpServerCreation,
@@ -1942,6 +1945,7 @@ export class ClineProvider
 			terminalZshOhMy: terminalZshOhMy ?? false,
 			terminalZshP10k: terminalZshP10k ?? false,
 			terminalZdotdir: terminalZdotdir ?? false,
+			terminalPreferredProfile: terminalPreferredProfile ?? "",
 			fuzzyMatchThreshold: fuzzyMatchThreshold ?? 1.0,
 			mcpEnabled: mcpEnabled ?? true,
 			enableMcpServerCreation: enableMcpServerCreation ?? true,
@@ -2167,6 +2171,7 @@ export class ClineProvider
 			terminalZshP10k: stateValues.terminalZshP10k ?? false,
 			terminalZdotdir: stateValues.terminalZdotdir ?? false,
 			terminalCompressProgressBar: stateValues.terminalCompressProgressBar ?? true,
+			terminalPreferredProfile: stateValues.terminalPreferredProfile ?? "",
 			mode: stateValues.mode ?? defaultModeSlug,
 			language: stateValues.language ?? formatLanguage(vscode.env.language),
 			mcpEnabled: stateValues.mcpEnabled ?? true,

src/core/webview/webviewMessageHandler.ts

@@ -36,6 +36,7 @@ import {
 import { checkExistKey } from "../../shared/checkExistApiConfig"
 import { experimentDefault } from "../../shared/experiments"
 import { Terminal } from "../../integrations/terminal/Terminal"
+import { TerminalProfileService } from "../../integrations/terminal/TerminalProfileService"
 import { openFile } from "../../integrations/misc/open-file"
 import { openImage, saveImage } from "../../integrations/misc/image-handler"
 import { selectImages } from "../../integrations/misc/process-images"
@@ -1524,6 +1525,31 @@ export const webviewMessageHandler = async (
 				Terminal.setCompressProgressBar(message.bool)
 			}
 			break
+		case "terminalPreferredProfile":
+			await updateGlobalState("terminalPreferredProfile", message.text)
+			await provider.postStateToWebview()
+			if (message.text !== undefined) {
+				Terminal.setTerminalPreferredProfile(message.text)
+			}
+			break
+		case "getTerminalProfiles":
+			try {
+				const profiles = TerminalProfileService.getAllSelectableProfiles()
+				await provider.postMessageToWebview({
+					type: "terminalProfiles",
+					profiles,
+				})
+			} catch (error) {
+				provider.log(
+					`Error getting terminal profiles: ${error instanceof Error ? error.message : String(error)}`,
+				)
+				// Send empty array on error
+				await provider.postMessageToWebview({
+					type: "terminalProfiles",
+					profiles: [],
+				})
+			}
+			break
 		case "mode":
 			await provider.handleModeSwitch(message.text as Mode)
 			break

src/integrations/terminal/BaseTerminal.ts

@@ -160,6 +160,7 @@ export abstract class BaseTerminal implements RooTerminal {
 	private static terminalZshP10k: boolean = false
 	private static terminalZdotdir: boolean = false
 	private static compressProgressBar: boolean = true
+	private static terminalPreferredProfile: string | undefined = undefined
 
 	/**
 	 * Compresses terminal output by applying run-length encoding and truncating to line limit
@@ -314,4 +315,20 @@ export abstract class BaseTerminal implements RooTerminal {
 	public static getCompressProgressBar(): boolean {
 		return BaseTerminal.compressProgressBar
 	}
+
+	/**
+	 * Sets the preferred terminal profile
+	 * @param profileName The preferred terminal profile name
+	 */
+	public static setTerminalPreferredProfile(profileName: string | undefined): void {
+		BaseTerminal.terminalPreferredProfile = profileName
+	}
+
+	/**
+	 * Gets the preferred terminal profile
+	 * @returns The preferred terminal profile name
+	 */
+	public static getTerminalPreferredProfile(): string | undefined {
+		return BaseTerminal.terminalPreferredProfile
+	}
 }

src/integrations/terminal/Terminal.ts

@@ -5,6 +5,7 @@ import type { RooTerminalCallbacks, RooTerminalProcessResultPromise } from "./ty
 import { BaseTerminal } from "./BaseTerminal"
 import { TerminalProcess } from "./TerminalProcess"
 import { ShellIntegrationManager } from "./ShellIntegrationManager"
+import { TerminalProfileService } from "./TerminalProfileService"
 import { mergePromise } from "./mergePromise"
 
 export class Terminal extends BaseTerminal {
@@ -17,7 +18,34 @@ export class Terminal extends BaseTerminal {
 
 		const env = Terminal.getEnv()
 		const iconPath = new vscode.ThemeIcon("rocket")
-		this.terminal = terminal ?? vscode.window.createTerminal({ cwd, name: "Roo Code", iconPath, env })
+
+		// Get the full profile configuration from the user's preferred profile
+		const preferredProfile = Terminal.getTerminalPreferredProfile()
+		const profileOptions = TerminalProfileService.getTerminalOptionsForRoo(preferredProfile)
+
+		const terminalOptions: vscode.TerminalOptions = {
+			cwd,
+			name: "Roo Code",
+			iconPath,
+			env,
+		}
+
+		// Apply profile configuration if available
+		if (profileOptions) {
+			// Merge profile options with our base options
+			Object.assign(terminalOptions, profileOptions)
+
+			// Merge environment variables (profile env + our env)
+			if (profileOptions.env) {
+				terminalOptions.env = { ...profileOptions.env, ...env }
+			}
+
+			// Keep our icon and name unless profile specifies otherwise
+			terminalOptions.name = "Roo Code"
+			terminalOptions.iconPath = iconPath
+		}
+
+		this.terminal = terminal ?? vscode.window.createTerminal(terminalOptions)
 
 		if (Terminal.getTerminalZdotdir()) {
 			ShellIntegrationManager.terminalTmpDirs.set(id, env.ZDOTDIR)

src/integrations/terminal/TerminalProfileService.ts

@@ -0,0 +1,194 @@
+import * as vscode from "vscode"
+
+export interface TerminalProfile {
+	name: string
+	path?: string
+	args?: string[]
+	icon?: string
+	color?: string
+	env?: Record<string, string>
+}
+
+export interface TerminalProfileInfo {
+	name: string
+	displayName: string
+	shellPath?: string
+	isDefault?: boolean
+}
+
+export class TerminalProfileService {
+	/**
+	 * Gets the current platform identifier for terminal profiles
+	 */
+	private static getPlatform(): string {
+		switch (process.platform) {
+			case "win32":
+				return "windows"
+			case "darwin":
+				return "osx"
+			case "linux":
+				return "linux"
+			default:
+				return "linux"
+		}
+	}
+
+	/**
+	 * Gets all available terminal profiles for the current platform
+	 */
+	public static getAvailableProfiles(): TerminalProfileInfo[] {
+		const platform = this.getPlatform()
+		const config = vscode.workspace.getConfiguration("terminal.integrated")
+
+		// Get profiles for the current platform
+		const profiles = config.get<Record<string, TerminalProfile>>(`profiles.${platform}`) || {}
+
+		// Get the default profile name
+		const defaultProfile = config.get<string>(`defaultProfile.${platform}`)
+
+		// Convert profiles to our format
+		const profileInfos: TerminalProfileInfo[] = Object.entries(profiles).map(([name, profile]) => ({
+			name,
+			displayName: name,
+			shellPath: profile.path,
+			isDefault: name === defaultProfile,
+		}))
+
+		// If no profiles are configured, return an empty array
+		// VSCode will use its built-in defaults
+		return profileInfos
+	}
+
+	/**
+	 * Gets the default profile for the current platform
+	 */
+	public static getDefaultProfile(): TerminalProfileInfo | undefined {
+		const platform = this.getPlatform()
+		const config = vscode.workspace.getConfiguration("terminal.integrated")
+
+		const defaultProfileName = config.get<string>(`defaultProfile.${platform}`)
+
+		if (defaultProfileName) {
+			const profiles = this.getAvailableProfiles()
+			return profiles.find((profile) => profile.name === defaultProfileName)
+		}
+
+		return undefined
+	}
+
+	/**
+	 * Gets a specific profile by name
+	 */
+	public static getProfileByName(name: string): TerminalProfileInfo | undefined {
+		const profiles = this.getAvailableProfiles()
+		return profiles.find((profile) => profile.name === name)
+	}
+
+	/**
+	 * Gets the shell path for a given profile name
+	 * Returns undefined if profile doesn't exist or doesn't specify a path
+	 */
+	public static getShellPathForProfile(profileName: string): string | undefined {
+		if (!profileName) {
+			return undefined
+		}
+
+		// Check regular profiles
+		const profile = this.getProfileByName(profileName)
+		return profile?.shellPath
+	}
+
+	/**
+	 * Gets the full profile configuration from terminal.integrated.profiles.{platform}
+	 */
+	public static getProfileConfiguration(profileName: string): Partial<vscode.TerminalOptions> | undefined {
+		if (!profileName) {
+			return undefined
+		}
+
+		const platform = this.getPlatform()
+		const config = vscode.workspace.getConfiguration("terminal.integrated")
+		const profiles = config.get<Record<string, TerminalProfile>>(`profiles.${platform}`) || {}
+
+		const profile = profiles[profileName]
+		if (!profile) {
+			return undefined
+		}
+
+		// Convert VSCode terminal profile to vscode.TerminalOptions
+		const terminalOptions: Partial<vscode.TerminalOptions> = {}
+
+		if (profile.path) {
+			terminalOptions.shellPath = profile.path
+		}
+
+		if (profile.args) {
+			terminalOptions.shellArgs = profile.args
+		}
+
+		if (profile.env) {
+			terminalOptions.env = profile.env
+		}
+
+		if (profile.icon) {
+			terminalOptions.iconPath = new vscode.ThemeIcon(profile.icon)
+		}
+
+		if (profile.color) {
+			terminalOptions.color = new vscode.ThemeColor(profile.color)
+		}
+
+		return terminalOptions
+	}
+
+	/**
+	 * Gets the terminal options that Roo should use for terminals
+	 * Priority: 1. User's preferred profile, 2. Default profile, 3. undefined (VSCode default)
+	 */
+	public static getTerminalOptionsForRoo(preferredProfile?: string): Partial<vscode.TerminalOptions> | undefined {
+		// 1. Check user's preferred profile
+		if (preferredProfile) {
+			const profileConfig = this.getProfileConfiguration(preferredProfile)
+			if (profileConfig) {
+				return profileConfig
+			}
+		}
+
+		// 2. Check default profile
+		const defaultProfile = this.getDefaultProfile()
+		if (defaultProfile) {
+			const profileConfig = this.getProfileConfiguration(defaultProfile.name)
+			if (profileConfig) {
+				return profileConfig
+			}
+		}
+
+		// 3. Let VSCode use its default
+		return undefined
+	}
+
+	/**
+	 * Gets the shell path that Roo should use for terminals (backward compatibility)
+	 * Priority: 1. User's preferred profile, 2. Default profile, 3. undefined (VSCode default)
+	 */
+	public static getShellPathForRoo(preferredProfile?: string): string | undefined {
+		const terminalOptions = this.getTerminalOptionsForRoo(preferredProfile)
+		return terminalOptions?.shellPath
+	}
+
+	/**
+	 * Gets all profiles that should be shown in the UI
+	 */
+	public static getAllSelectableProfiles(): TerminalProfileInfo[] {
+		const profiles = this.getAvailableProfiles()
+
+		// Add a "Default" option that represents using VSCode's default behavior
+		profiles.unshift({
+			name: "",
+			displayName: "Default (VSCode Default)",
+			isDefault: false,
+		})
+
+		return profiles
+	}
+}