Merge branch 'remove-pylance-client2' of https://github.com/bschnurr/vscode-python into remove-pylance-client2

Author: bschnurr

build/azure-pipeline.stable.yml

@@ -92,8 +92,8 @@ extends:
         displayName: Build
 
       - bash: |
-            mkdir -p $(Build.SourcesDirectory)/python-env-tools/bin
-            chmod +x $(Build.SourcesDirectory)/python-env-tools/bin
+          mkdir -p $(Build.SourcesDirectory)/python-env-tools/bin
+          chmod +x $(Build.SourcesDirectory)/python-env-tools/bin
         displayName: Make Directory for python-env-tool binary
 
       - bash: |
@@ -124,30 +124,30 @@ extends:
 
       - task: DownloadPipelineArtifact@2
         inputs:
-            buildType: 'specific'
-            project: 'Monaco'
-            definition: 593
-            buildVersionToDownload: 'latestFromBranch'
-            branchName: 'refs/heads/release/2025.10'
-            targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
-            artifactName: 'bin-$(buildTarget)'
-            itemPattern: |
-              pet.exe
-              pet
-              ThirdPartyNotices.txt
+          buildType: 'specific'
+          project: 'Monaco'
+          definition: 593
+          buildVersionToDownload: 'latestFromBranch'
+          branchName: 'refs/heads/release/2025.12'
+          targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
+          artifactName: 'bin-$(buildTarget)'
+          itemPattern: |
+            pet.exe
+            pet
+            ThirdPartyNotices.txt
 
       - bash: |
-            ls -lf ./python-env-tools/bin
-            chmod +x ./python-env-tools/bin/pet*
-            ls -lf ./python-env-tools/bin
+          ls -lf ./python-env-tools/bin
+          chmod +x ./python-env-tools/bin/pet*
+          ls -lf ./python-env-tools/bin
         displayName: Set chmod for pet binary
 
       - script: python -c "import shutil; shutil.rmtree('.nox', ignore_errors=True)"
         displayName: Clean up Nox
     tsa:
-        config:
-            areaPath: 'Visual Studio Code Python Extensions'
-            serviceTreeID: '6e6194bc-7baa-4486-86d0-9f5419626d46'
-        enabled: true
+      config:
+        areaPath: 'Visual Studio Code Python Extensions'
+        serviceTreeID: '6e6194bc-7baa-4486-86d0-9f5419626d46'
+      enabled: true
     apiScanDependentPipelineId: '593' # python-environment-tools
     apiScanSoftwareVersion: '2024'

package-lock.json

@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "Python language support with extension access points for IntelliSense (Pylance), Debugging (Python Debugger), linting, formatting, refactoring, unit tests, and more.",
-    "version": "2025.11.0-dev",
+    "version": "2025.13.0-dev",
     "featureFlags": {
         "usingNewInterpreterStorage": true
     },
@@ -83,7 +83,8 @@
         "onLanguageModelTool:get_python_executable_details",
         "onLanguageModelTool:install_python_packages",
         "onLanguageModelTool:configure_python_environment",
-        "onLanguageModelTool:create_virtual_environment"
+        "onLanguageModelTool:create_virtual_environment",
+        "onTerminalShellIntegration:python"
     ],
     "main": "./out/client/extension",
     "browser": "./dist/extension.browser.js",
@@ -640,7 +641,7 @@
                     "type": "array"
                 },
                 "python.terminal.shellIntegration.enabled": {
-                    "default": false,
+                    "default": true,
                     "markdownDescription": "%python.terminal.shellIntegration.enabled.description%",
                     "scope": "resource",
                     "type": "boolean",

package.json

@@ -8,6 +8,7 @@ import '../../extensions';
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import { Uri } from 'vscode';
+import { traceInfo, traceVerbose, traceWarn } from '../../../logging';
 
 import { IComponentAdapter, ICondaService } from '../../../interpreter/contracts';
 import { IPlatformService } from '../../platform/types';
@@ -53,28 +54,36 @@ export class CondaActivationCommandProvider implements ITerminalActivationComman
         pythonPath: string,
         targetShell: TerminalShellType,
     ): Promise<string[] | undefined> {
+        traceVerbose(`Getting conda activation commands for interpreter ${pythonPath} with shell ${targetShell}`);
         const envInfo = await this.pyenvs.getCondaEnvironment(pythonPath);
         if (!envInfo) {
+            traceWarn(`No conda environment found for interpreter ${pythonPath}`);
             return undefined;
         }
+        traceVerbose(`Found conda environment: ${JSON.stringify(envInfo)}`);
 
         const condaEnv = envInfo.name.length > 0 ? envInfo.name : envInfo.path;
 
         // New version.
         const interpreterPath = await this.condaService.getInterpreterPathForEnvironment(envInfo);
+        traceInfo(`Using interpreter path: ${interpreterPath}`);
         const activatePath = await this.condaService.getActivationScriptFromInterpreter(interpreterPath, envInfo.name);
+        traceVerbose(`Got activation script: ${activatePath?.path}} with type: ${activatePath?.type}`);
         // eslint-disable-next-line camelcase
         if (activatePath?.path) {
             if (
                 this.platform.isWindows &&
                 targetShell !== TerminalShellType.bash &&
                 targetShell !== TerminalShellType.gitbash
             ) {
-                return [activatePath.path, `conda activate ${condaEnv.toCommandArgumentForPythonExt()}`];
+                const commands = [activatePath.path, `conda activate ${condaEnv.toCommandArgumentForPythonExt()}`];
+                traceInfo(`Using Windows-specific commands: ${commands.join(', ')}`);
+                return commands;
             }
 
             const condaInfo = await this.condaService.getCondaInfo();
 
+            traceVerbose(`Conda shell level: ${condaInfo?.conda_shlvl}`);
             if (
                 activatePath.type !== 'global' ||
                 // eslint-disable-next-line camelcase
@@ -84,27 +93,36 @@ export class CondaActivationCommandProvider implements ITerminalActivationComman
                 // activatePath is not the global activate path, or we don't have a shlvl, or it's -1（conda never sourced）.
                 // and we need to source the activate path.
                 if (activatePath.path === 'activate') {
-                    return [
+                    const commands = [
                         `source ${activatePath.path}`,
                         `conda activate ${condaEnv.toCommandArgumentForPythonExt()}`,
                     ];
+                    traceInfo(`Using source activate commands: ${commands.join(', ')}`);
+                    return commands;
                 }
-                return [`source ${activatePath.path} ${condaEnv.toCommandArgumentForPythonExt()}`];
+                const command = [`source ${activatePath.path} ${condaEnv.toCommandArgumentForPythonExt()}`];
+                traceInfo(`Using single source command: ${command}`);
+                return command;
             }
-            return [`conda activate ${condaEnv.toCommandArgumentForPythonExt()}`];
+            const command = [`conda activate ${condaEnv.toCommandArgumentForPythonExt()}`];
+            traceInfo(`Using direct conda activate command: ${command}`);
+            return command;
         }
 
         switch (targetShell) {
             case TerminalShellType.powershell:
             case TerminalShellType.powershellCore:
+                traceVerbose('Using PowerShell-specific activation');
                 return _getPowershellCommands(condaEnv);
 
             // TODO: Do we really special-case fish on Windows?
             case TerminalShellType.fish:
+                traceVerbose('Using Fish shell-specific activation');
                 return getFishCommands(condaEnv, await this.condaService.getCondaFile());
 
             default:
                 if (this.platform.isWindows) {
+                    traceVerbose('Using Windows shell-specific activation fallback option.');
                     return this.getWindowsCommands(condaEnv);
                 }
                 return getUnixCommands(condaEnv, await this.condaService.getCondaFile());

src/client/common/terminal/environmentActivationProviders/condaActivationProvider.ts

@@ -2,6 +2,7 @@ import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import { SemVer } from 'semver';
 import { IFileSystem, IPlatformService } from '../../../common/platform/types';
+import { traceVerbose } from '../../../logging';
 import { cache } from '../../../common/utils/decorators';
 import { ICondaService } from '../../../interpreter/contracts';
 import { traceDecoratorVerbose } from '../../../logging';
@@ -23,12 +24,15 @@ export class CondaService implements ICondaService {
         interpreterPath?: string,
         envName?: string,
     ): Promise<{ path: string | undefined; type: 'local' | 'global' } | undefined> {
+        traceVerbose(`Getting activation script for interpreter ${interpreterPath}, env ${envName}`);
         const condaPath = await this.getCondaFileFromInterpreter(interpreterPath, envName);
+        traceVerbose(`Found conda path: ${condaPath}`);
 
         const activatePath = (condaPath
             ? path.join(path.dirname(condaPath), 'activate')
             : 'activate'
         ).fileToCommandArgumentForPythonExt(); // maybe global activate?
+        traceVerbose(`Using activate path: ${activatePath}`);
 
         // try to find the activate script in the global conda root prefix.
         if (this.platform.isLinux || this.platform.isMac) {
@@ -41,6 +45,7 @@ export class CondaService implements ICondaService {
                     .fileToCommandArgumentForPythonExt();
 
                 if (activatePath === globalActivatePath || !(await this.fileSystem.fileExists(activatePath))) {
+                    traceVerbose(`Using global activate path: ${globalActivatePath}`);
                     return {
                         path: globalActivatePath,
                         type: 'global',