diff --git a/src/core/tools/executeCommandTool.ts b/src/core/tools/executeCommandTool.ts index 2c7ce0d023e2..b0ae07bf86a2 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 833fe93dde1e..4baed55fba46 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")} + +
+ + + {" "} + + +
+
+