diff --git a/apps/vscode-e2e/src/types/global.d.ts b/apps/vscode-e2e/src/types/global.d.ts
index c2b11bf335..5c7fb164ad 100644
--- a/apps/vscode-e2e/src/types/global.d.ts
+++ b/apps/vscode-e2e/src/types/global.d.ts
@@ -1,7 +1,6 @@
 import type { RooCodeAPI } from "@roo-code/types"
 
 declare global {
-	// eslint-disable-next-line no-var
 	var api: RooCodeAPI
 }
 
diff --git a/apps/web-evals/next-env.d.ts b/apps/web-evals/next-env.d.ts
index 1b3be0840f..830fb594ca 100644
--- a/apps/web-evals/next-env.d.ts
+++ b/apps/web-evals/next-env.d.ts
@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference path="./.next/types/routes.d.ts" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/src/core/tools/executeCommandTool.ts b/src/core/tools/executeCommandTool.ts
index 2c7ce0d023..b0ae07bf86 100644
--- a/src/core/tools/executeCommandTool.ts
+++ b/src/core/tools/executeCommandTool.ts
@@ -67,7 +67,7 @@ export async function executeCommandTool(
 			const {
 				terminalOutputLineLimit = 500,
 				terminalOutputCharacterLimit = DEFAULT_TERMINAL_OUTPUT_CHARACTER_LIMIT,
-				terminalShellIntegrationDisabled = false,
+				terminalShellIntegrationDisabled = true,
 			} = providerState ?? {}
 
 			// Get command execution timeout from VSCode configuration (in seconds)
@@ -149,7 +149,7 @@ export async function executeCommand(
 		executionId,
 		command,
 		customCwd,
-		terminalShellIntegrationDisabled = false,
+		terminalShellIntegrationDisabled = true,
 		terminalOutputLineLimit = 500,
 		terminalOutputCharacterLimit = DEFAULT_TERMINAL_OUTPUT_CHARACTER_LIMIT,
 		commandExecutionTimeout = 0,
diff --git a/webview-ui/src/components/settings/TerminalSettings.tsx b/webview-ui/src/components/settings/TerminalSettings.tsx
index 833fe93dde..4baed55fba 100644
--- a/webview-ui/src/components/settings/TerminalSettings.tsx
+++ b/webview-ui/src/components/settings/TerminalSettings.tsx
@@ -201,35 +201,7 @@ export const TerminalSettings = ({
 					<div className="flex flex-col gap-3 pl-3 border-l-2 border-vscode-button-background">
 						<div>
 							<VSCodeCheckbox
-								checked={inheritEnv}
-								onChange={(e: any) => {
-									setInheritEnv(e.target.checked)
-									vscode.postMessage({
-										type: "updateVSCodeSetting",
-										setting: "terminal.integrated.inheritEnv",
-										value: e.target.checked,
-									})
-								}}
-								data-testid="terminal-inherit-env-checkbox">
-								<span className="font-medium">{t("settings:terminal.inheritEnv.label")}</span>
-							</VSCodeCheckbox>
-							<div className="text-vscode-descriptionForeground text-sm mt-1">
-								<Trans i18nKey="settings:terminal.inheritEnv.description">
-									<VSCodeLink
-										href={buildDocLink(
-											"features/shell-integration#inherit-environment-variables",
-											"settings_terminal_inherit_env",
-										)}
-										style={{ display: "inline" }}>
-										{" "}
-									</VSCodeLink>
-								</Trans>
-							</div>
-						</div>
-
-						<div>
-							<VSCodeCheckbox
-								checked={terminalShellIntegrationDisabled ?? false}
+								checked={terminalShellIntegrationDisabled ?? true}
 								onChange={(e: any) =>
 									setCachedStateField("terminalShellIntegrationDisabled", e.target.checked)
 								}>
@@ -253,6 +225,34 @@ export const TerminalSettings = ({
 
 						{!terminalShellIntegrationDisabled && (
 							<>
+								<div>
+									<VSCodeCheckbox
+										checked={inheritEnv}
+										onChange={(e: any) => {
+											setInheritEnv(e.target.checked)
+											vscode.postMessage({
+												type: "updateVSCodeSetting",
+												setting: "terminal.integrated.inheritEnv",
+												value: e.target.checked,
+											})
+										}}
+										data-testid="terminal-inherit-env-checkbox">
+										<span className="font-medium">{t("settings:terminal.inheritEnv.label")}</span>
+									</VSCodeCheckbox>
+									<div className="text-vscode-descriptionForeground text-sm mt-1">
+										<Trans i18nKey="settings:terminal.inheritEnv.description">
+											<VSCodeLink
+												href={buildDocLink(
+													"features/shell-integration#inherit-environment-variables",
+													"settings_terminal_inherit_env",
+												)}
+												style={{ display: "inline" }}>
+												{" "}
+											</VSCodeLink>
+										</Trans>
+									</div>
+								</div>
+
 								<div>
 									<label className="block font-medium mb-1">
 										{t("settings:terminal.shellIntegrationTimeout.label")}
diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json
index 6d0ae8b3c8..65fca22bf1 100644
--- a/webview-ui/src/i18n/locales/en/settings.json
+++ b/webview-ui/src/i18n/locales/en/settings.json
@@ -619,55 +619,55 @@
 		},
 		"advanced": {
 			"label": "Terminal Settings: Advanced",
-			"description": "The following options may require a terminal restart to apply the setting."
+			"description": "These settings apply only when 'Use Inline Terminal' is disabled."
 		},
 		"outputLineLimit": {
 			"label": "Terminal output limit",
-			"description": "Keeps the beginning and end of command output and drops the middle when needed to stay under the limit. Lower to save tokens; raise if you need more middle content. <0>Learn more</0>"
+			"description": "Keeps the first and last lines and drops the middle to stay under the limit. Lower to save tokens; raise to give Roo more middle detail. Roo sees a placeholder where the content is skipped.<0>Learn more</0>"
 		},
 		"outputCharacterLimit": {
 			"label": "Terminal character limit",
-			"description": "Hard cap on output size. Keeps the beginning and end and omits the middle if needed. Overrides the line limit to prevent memory issues from very long lines. <0>Learn more</0>"
+			"description": "Overrides the line limit to prevent memory issues by enforcing a hard cap on output size. If exceeded, keeps the beginning and end and shows a placeholder to Roo where content is skipped. <0>Learn more</0>"
 		},
 		"shellIntegrationTimeout": {
 			"label": "Terminal shell integration timeout",
-			"description": "How long to wait for VS Code shell integration before running commands. Increase if you see 'Shell Integration Unavailable' errors. Only applies when using the VS Code terminal. <0>Learn more</0>"
+			"description": "How long to wait for VS Code shell integration before running commands. Raise if your shell starts slowly or you see 'Shell Integration Unavailable' errors. <0>Learn more</0>"
 		},
 		"shellIntegrationDisabled": {
 			"label": "Use Inline Terminal (recommended)",
-			"description": "Run commands in a background process and stream output in chat (outside the VS Code terminal). Avoids shell profiles and shell integration, improving reliability and preventing 'Shell Integration Unavailable' errors. Recommended. <0>Learn more</0>"
+			"description": "Run commands in the Inline Terminal (chat) to bypasses shell profiles/integration for faster, more reliable runs. When disabled Roo uses the VS Code terminal with your shell profile, prompts, and plugins. <0>Learn more</0>"
 		},
 		"commandDelay": {
 			"label": "Terminal command delay",
-			"description": "Adds a small delay after each command to help VS Code terminals flush all output. Set to 0 to disable. Workaround for terminal timing issues; usually not needed. <0>Learn more</0>"
+			"description": "Adds a short pause after each command so the VS Code terminal can flush all output (bash/zsh: PROMPT_COMMAND sleep; PowerShell: start-sleep). Use only if you see missing tail output; otherwise leave at 0. VS Code terminal only. <0>Learn more</0>"
 		},
 		"compressProgressBar": {
 			"label": "Compress progress bar output",
-			"description": "Recommended. Processes carriage returns (\\r) and backspaces (\\b) so progress bars and spinners render like a real terminal and only the final state is kept. Saves tokens; disable only when you need to inspect intermediate updates. <0>Learn more</0>"
+			"description": "Collapses progress bars/spinners so only the final state is kept (saves tokens). <0>Learn more</0>"
 		},
 		"powershellCounter": {
 			"label": "Enable PowerShell counter workaround",
-			"description": "Adds a small counter to PowerShell commands to work around missing output or repeated-command issues on some setups. <0>Learn more</0>"
+			"description": "Turn this on when PowerShell output is missing or duplicated; it appends a tiny counter to each command to stabilize output. Keep this off if output already looks correct. <0>Learn more</0>"
 		},
 		"zshClearEolMark": {
 			"label": "Clear ZSH EOL mark",
-			"description": "Clears ZSH's end-of-line mark (%) so output is parsed correctly. <0>Learn more</0>"
+			"description": "Turn this on when you see stray % at the end of lines or parsing looks wrong; it omits Zsh’s end‑of‑line mark (%).  <0>Learn more</0>"
 		},
 		"zshOhMy": {
 			"label": "Enable Oh My Zsh integration",
-			"description": "Enables Oh My Zsh shell integration detection. May require restarting the IDE. <0>Learn more</0>"
+			"description": "Turn this on when your Oh My Zsh theme/plugins expect shell integration; it sets ITERM_SHELL_INTEGRATION_INSTALLED=Yes. Turn this off to avoid setting that variable. VS Code terminal (zsh) only. May require restarting the IDE. <0>Learn more</0>"
 		},
 		"zshP10k": {
 			"label": "Enable Powerlevel10k integration",
-			"description": "Enables Powerlevel10k shell integration detection. <0>Learn more</0>"
+			"description": "Turn this on when using Powerlevel10k shell integration. <0>Learn more</0>"
 		},
 		"zdotdir": {
 			"label": "Enable ZDOTDIR handling",
-			"description": "Uses a temporary ZDOTDIR so VS Code shell integration works with zsh while preserving your config. <0>Learn more</0>"
+			"description": "Turn this on when zsh shell integration fails or conflicts with your dotfiles.<0>Learn more</0>"
 		},
 		"inheritEnv": {
 			"label": "Inherit environment variables",
-			"description": "Let the terminal inherit environment variables from the parent VS Code process. Toggles VS Code setting 'terminal.integrated.inheritEnv'. <0>Learn more</0>"
+			"description": "Turn this to inherit environment variables from the parent VS Code process.<0>Learn more</0>"
 		}
 	},
 	"advancedSettings": {