Terminal settings: Cleanup terminal settings tab and change default terminal to inline (#8342)

Co-authored-by: Copilot <[email protected]>

Author: hannesrudolph

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,

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")}