require python envs ext respecting terminal.activateEnvironment

Author: eleanorjboyd

package.nls.json

@@ -6,7 +6,7 @@
     "python-envs.pythonProjects.envManager.description": "The environment manager for creating and managing environments for this project.",
     "python-envs.pythonProjects.packageManager.description": "The package manager for managing packages in environments for this project.",
     "python-envs.terminal.showActivateButton.description": "Whether to show the 'Activate' button in the terminal menu",
-    "python-envs.terminal.autoActivationType.description": "Specifies how the extension can activate an environment in a terminal.\n\nUtilizing Shell Startup requires changes to the shell script file and is only enabled for the following shells: zsh, fsh, pwsh, bash, cmd. When set to `command`, any shell can be activated.\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\nTo revert changes made during shellStartup, run `Python Envs: Revert Shell Startup Script Changes`.",
+    "python-envs.terminal.autoActivationType.description": "Specifies how the extension can activate an environment in a terminal.\n\nUtilizing Shell Startup requires changes to the shell script file and is only enabled for the following shells: zsh, fsh, pwsh, bash, cmd. When set to `command`, any shell can be activated. To disable activation you must both set this setting to `off` and also set `python.terminal.activateEnvironment` to `false`.\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\nTo revert changes made during shellStartup, run `Python Envs: Revert Shell Startup Script Changes`.",
     "python-envs.terminal.autoActivationType.command": "Activation by executing a command in the terminal.",
     "python-envs.terminal.autoActivationType.shellStartup": "Activation by modifying the terminal shell startup script. To use this feature we will need to modify your shell startup scripts.",
     "python-envs.terminal.autoActivationType.off": "No automatic activation of environments.",

src/extension.ts

@@ -144,10 +144,16 @@ async function collectEnvironmentInfo(
 
         // Current settings (non-sensitive)
         const config = workspace.getConfiguration('python-envs');
+        const pyConfig = workspace.getConfiguration('python');
         info.push('\nExtension Settings:');
         info.push(`  Default Environment Manager: ${config.get('defaultEnvManager')}`);
         info.push(`  Default Package Manager: ${config.get('defaultPackageManager')}`);
-        info.push(`  Terminal Auto Activation: ${config.get('terminal.autoActivationType')}`);
+        const pyenvAct = config.get('terminal.autoActivationType');
+        const pythonAct = pyConfig.get('terminal.activateEnvironment');
+        const bothAct = pyenvAct && pythonAct ? 'true' : 'false';
+        info.push(
+            `Auto Activation set to ${bothAct} because py-env.terminal.autoActivationType is ${pyenvAct} and python.terminal.activateEnvironment is ${pythonAct}\n`,
+        );
     } catch (err) {
         info.push(`\nError collecting environment information: ${err}`);
     }

src/features/terminal/terminalManager.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { Disposable, EventEmitter, ProgressLocation, Terminal, TerminalOptions, Uri } from 'vscode';
 import { PythonEnvironment, PythonEnvironmentApi, PythonProject, PythonTerminalCreateOptions } from '../../api';
 import { ActivationStrings } from '../../common/localize';
-import { traceInfo, traceVerbose } from '../../common/logging';
+import { traceInfo, traceVerbose, traceWarn } from '../../common/logging';
 import {
     createTerminal,
     onDidChangeWindowState,
@@ -235,7 +235,20 @@ export class TerminalManagerImpl implements TerminalManager {
                 traceVerbose(`Environment ${environment.environmentPath.fsPath} is not activatable`);
             }
         } else if (actType === ACT_TYPE_OFF) {
-            traceInfo(`"python-envs.terminal.autoActivationType" is set to "${actType}", skipping auto activation`);
+            // Check both settings before skipping activation
+            const pyEnvConfig = getConfiguration('python-envs');
+            const pythonConfig = getConfiguration('python');
+            const pyEnvAct = pyEnvConfig.get('terminal.autoActivationType');
+            const pythonAct = pythonConfig.get('terminal.activateEnvironment');
+            if (pythonAct === false) {
+                traceInfo(
+                    `Auto activation skipped: "python-envs.terminal.autoActivationType" is "${pyEnvAct}" and "python.terminal.activateEnvironment" is "${pythonAct}".`,
+                );
+            } else {
+                traceWarn(
+                    `Auto activation requires both settings to align: "python-envs.terminal.autoActivationType" and "python.terminal.activateEnvironment". If you don't want auto activation, ensure "python.terminal.activateEnvironment" is set to 'false'.`,
+                );
+            }
         } else if (actType === ACT_TYPE_SHELL) {
             traceInfo(
                 `"python-envs.terminal.autoActivationType" is set to "${actType}", terminal should be activated by shell startup script`,