From f7856ef5cc383e69a658d23f38d85c26b69eb530 Mon Sep 17 00:00:00 2001 From: Hannes Rudolph Date: Mon, 3 Nov 2025 08:38:09 -0700 Subject: [PATCH] Terminal settings: Cleanup terminal settings tab and change default terminal to inline (#8342) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/core/tools/executeCommandTool.ts | 4 +- .../components/settings/TerminalSettings.tsx | 58 +++++++++---------- webview-ui/src/i18n/locales/ca/settings.json | 46 +++++++-------- webview-ui/src/i18n/locales/de/settings.json | 38 ++++++------ webview-ui/src/i18n/locales/en/settings.json | 28 ++++----- webview-ui/src/i18n/locales/es/settings.json | 42 +++++++------- webview-ui/src/i18n/locales/fr/settings.json | 36 ++++++------ webview-ui/src/i18n/locales/hi/settings.json | 28 ++++----- webview-ui/src/i18n/locales/id/settings.json | 38 ++++++------ webview-ui/src/i18n/locales/it/settings.json | 38 ++++++------ webview-ui/src/i18n/locales/ja/settings.json | 42 +++++++------- webview-ui/src/i18n/locales/ko/settings.json | 34 +++++------ webview-ui/src/i18n/locales/nl/settings.json | 36 ++++++------ webview-ui/src/i18n/locales/pl/settings.json | 34 +++++------ .../src/i18n/locales/pt-BR/settings.json | 40 ++++++------- webview-ui/src/i18n/locales/ru/settings.json | 32 +++++----- webview-ui/src/i18n/locales/tr/settings.json | 36 ++++++------ webview-ui/src/i18n/locales/vi/settings.json | 40 ++++++------- .../src/i18n/locales/zh-CN/settings.json | 32 +++++----- .../src/i18n/locales/zh-TW/settings.json | 34 +++++------ 20 files changed, 358 insertions(+), 358 deletions(-) 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 = ({
{ - setInheritEnv(e.target.checked) - vscode.postMessage({ - type: "updateVSCodeSetting", - setting: "terminal.integrated.inheritEnv", - value: e.target.checked, - }) - }} - data-testid="terminal-inherit-env-checkbox"> - {t("settings:terminal.inheritEnv.label")} - -
- - - {" "} - - -
-
- -
- setCachedStateField("terminalShellIntegrationDisabled", e.target.checked) }> @@ -253,6 +225,34 @@ export const TerminalSettings = ({ {!terminalShellIntegrationDisabled && ( <> +
+ { + setInheritEnv(e.target.checked) + vscode.postMessage({ + type: "updateVSCodeSetting", + setting: "terminal.integrated.inheritEnv", + value: e.target.checked, + }) + }} + data-testid="terminal-inherit-env-checkbox"> + {t("settings:terminal.inheritEnv.label")} + +
+ + + {" "} + + +
+
+