Fix environmentPath to use Python executable

Co-authored-by: edvilme <5952839+edvilme@users.noreply.github.com>

Author: Copilot

api/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to the `@vscode/python-environments` API package are documen
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.1]
+
+### Fixed
+
+- Clarified that `PythonEnvironmentInfo.environmentPath` always identifies the Python executable.
+
 ## [1.4.0]
 
 ### Changed

api/package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "@vscode/python-environments",
     "description": "An API facade for the Python Environments extension in VS Code",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "author": {
         "name": "Microsoft Corporation"
     },

api/package.json

@@ -173,7 +173,9 @@ async function getPythonInfo(env: NativeEnvInfo, nameStyle: VenvNameStyle = 'def
             version: env.version ?? 'Unknown',
             description: env.error,
             tooltip: env.error,
-            environmentPath: Uri.file(env.prefix ?? env.executable ?? ''),
+            environmentPath: Uri.file(
+                env.executable ?? (env.prefix ? getVenvPythonPath(env.prefix) : ''),
+            ),
             iconPath: new ThemeIcon('warning'),
             sysPrefix: env.prefix ?? '',
             execInfo: {

src/managers/builtin/venvUtils.ts

@@ -248,7 +248,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable {
                 // If the environment is inside the workspace, add a .gitignore file
                 try {
                     const projectUris = this.api.getPythonProjects().map((p) => p.uri.fsPath);
-                    const envPath = result.environmentPath?.fsPath;
+                    const envPath = result.sysPrefix;
                     if (envPath && projectUris.some((root) => envPath.startsWith(root))) {
                         const gitignorePath = path.join(envPath, '.gitignore');
                         await fs.writeFile(gitignorePath, '*\n', { flag: 'w' });
@@ -394,7 +394,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable {
                 // Notify user if CONDA_PREFIX is set and they're trying to select a different environment
                 if (process.env.CONDA_PREFIX && checkedEnv) {
                     const condaPrefixPath = process.env.CONDA_PREFIX;
-                    const selectedPath = checkedEnv.environmentPath.fsPath;
+                    const selectedPath = checkedEnv.sysPrefix;
                     // Only show notification if they selected a different environment
                     if (condaPrefixPath !== selectedPath) {
                         showInformationMessage(CondaStrings.condaCondaPrefixActive);

src/managers/conda/condaEnvManager.ts

@@ -80,7 +80,7 @@ export class CondaPackageManager implements PackageManager, Disposable {
             try {
                 const commandOptions = {
                     pythonExecutable: 'conda',
-                    condaEnvironmentPath: environment.environmentPath.fsPath,
+                    condaEnvironmentPath: environment.sysPrefix,
                     log: this.log,
                 };
 
@@ -172,7 +172,7 @@ export class CondaPackageManager implements PackageManager, Disposable {
     private async fetchPackages(environment: PythonEnvironment): Promise<Package[] | undefined> {
         const listCmd = new CondaListCommand({
             pythonExecutable: 'conda',
-            condaEnvironmentPath: environment.environmentPath.fsPath,
+            condaEnvironmentPath: environment.sysPrefix,
             log: this.log,
         });
         try {

src/managers/conda/condaPackageManager.ts

@@ -331,7 +331,7 @@ export async function getNamedCondaPythonInfo(
 
     return {
         name: name,
-        environmentPath: Uri.file(prefix),
+        environmentPath: Uri.file(executable),
         displayName: `${name} (${sv})`,
         shortDisplayName: `${name}:${sv}`,
         displayPath: prefix,
@@ -376,7 +376,7 @@ export async function getPrefixesCondaPythonInfo(
     const basename = path.basename(prefix);
     return {
         name: basename,
-        environmentPath: Uri.file(prefix),
+        environmentPath: Uri.file(executable),
         displayName: `${basename} (${sv})`,
         shortDisplayName: `${basename}:${sv}`,
         displayPath: prefix,
@@ -749,7 +749,9 @@ export function nonWindowsGenerateConfig(
 function getCondaWithoutPython(name: string, prefix: string, conda: string): PythonEnvironmentInfo {
     return {
         name: name,
-        environmentPath: Uri.file(prefix),
+        environmentPath: Uri.file(
+            isWindows() ? path.join(prefix, 'python.exe') : path.join(prefix, 'bin', 'python'),
+        ),
         displayName: `${name} (no-python)`,
         shortDisplayName: `${name} (no-python)`,
         displayPath: prefix,
@@ -1224,11 +1226,11 @@ export async function quickCreateConda(
 }
 
 export async function deleteCondaEnvironment(environment: PythonEnvironment, log: LogOutputChannel): Promise<boolean> {
-    let args = ['env', 'remove', '--yes', '--prefix', environment.environmentPath.fsPath];
+    let args = ['env', 'remove', '--yes', '--prefix', environment.sysPrefix];
     return await withProgress(
         {
             location: ProgressLocation.Notification,
-            title: l10n.t('Deleting conda environment: {0}', environment.environmentPath.fsPath),
+            title: l10n.t('Deleting conda environment: {0}', environment.sysPrefix),
         },
         async () => {
             try {

src/managers/conda/condaUtils.ts

@@ -166,6 +166,7 @@ export class PipenvManager implements EnvironmentManager, Disposable {
         return this.collection.find(
             (env) =>
                 normalizePath(env.environmentPath.fsPath) === normalized ||
+                normalizePath(env.sysPrefix) === normalized ||
                 (env.execInfo?.run.executable && normalizePath(env.execInfo.run.executable) === normalized),
         );
     }

src/managers/pipenv/pipenvManager.ts

@@ -105,7 +105,8 @@ export async function getPipenv(): Promise<string | undefined> {
     }
 }
 
-async function nativeToPythonEnv(
+/** Converts native finder data to a Pipenv environment. @internal Exported for testing. */
+export async function nativeToPythonEnv(
     info: NativeEnvInfo,
     api: PythonEnvironmentApi,
     manager: EnvironmentManager,
@@ -139,7 +140,7 @@ async function nativeToPythonEnv(
         shortDisplayName: displayName,
         displayPath: info.prefix,
         version: info.version,
-        environmentPath: Uri.file(info.prefix),
+        environmentPath: Uri.file(info.executable),
         description: undefined,
         tooltip: info.prefix,
         execInfo: {

src/managers/pipenv/pipenvUtils.ts

@@ -381,7 +381,7 @@ export async function nativeToPythonEnv(
         shortDisplayName: displayName,
         displayPath: info.prefix,
         version: info.version,
-        environmentPath: Uri.file(info.prefix),
+        environmentPath: Uri.file(info.executable),
         description: undefined,
         tooltip: info.prefix,
         execInfo: {