From d09d265698abb10ffbc4ea63975480d3c9e2070c Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 3 Feb 2026 08:37:22 -0800 Subject: [PATCH 1/2] fix: streamline environment retrieval in venvManager and pyenvManager --- src/managers/builtin/venvManager.ts | 6 +++--- src/managers/pyenv/pyenvManager.ts | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index e042cc11..aaf6562f 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -142,7 +142,7 @@ export class VenvManager implements EnvironmentManager { const venvRoot: Uri = Uri.file(await findParentIfFile(uri.fsPath)); - const globals = await this.baseManager.getEnvironments('global'); + const globals = await this.api.getEnvironments('global'); let result: CreateEnvironmentResult | undefined = undefined; if (options?.quickCreate) { // error on missing information @@ -492,7 +492,7 @@ export class VenvManager implements EnvironmentManager { private async resetGlobalEnv() { this.globalEnv = undefined; - const globals = await this.baseManager.getEnvironments('global'); + const globals = await this.api.getEnvironments('global'); await this.loadGlobalEnv(globals); } @@ -535,7 +535,7 @@ export class VenvManager implements EnvironmentManager { * Loads and maps Python environments to their corresponding project paths in the workspace. about O(p × e) where p = projects.len and e = environments.len */ private async loadEnvMap() { - const globals = await this.baseManager.getEnvironments('global'); + const globals = await this.api.getEnvironments('global'); await this.loadGlobalEnv(globals); this.fsPathToEnv.clear(); diff --git a/src/managers/pyenv/pyenvManager.ts b/src/managers/pyenv/pyenvManager.ts index a70c1b61..d4ddb46d 100644 --- a/src/managers/pyenv/pyenvManager.ts +++ b/src/managers/pyenv/pyenvManager.ts @@ -96,9 +96,7 @@ export class PyEnvManager implements EnvironmentManager, Disposable { } if (scope === 'global') { - return this.collection.filter((env) => { - env.group === PYENV_VERSIONS; - }); + return this.collection.filter((env) => env.group === PYENV_VERSIONS); } if (scope instanceof Uri) { From b2e66cc648f144df7876139b10033acf0fb77329 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 3 Feb 2026 09:06:34 -0800 Subject: [PATCH 2/2] fix: dead lock --- src/managers/builtin/venvManager.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index aaf6562f..1fd2a84d 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -492,7 +492,7 @@ export class VenvManager implements EnvironmentManager { private async resetGlobalEnv() { this.globalEnv = undefined; - const globals = await this.api.getEnvironments('global'); + const globals = await this.baseManager.getEnvironments('global'); await this.loadGlobalEnv(globals); } @@ -535,7 +535,7 @@ export class VenvManager implements EnvironmentManager { * Loads and maps Python environments to their corresponding project paths in the workspace. about O(p × e) where p = projects.len and e = environments.len */ private async loadEnvMap() { - const globals = await this.api.getEnvironments('global'); + const globals = await this.baseManager.getEnvironments('global'); await this.loadGlobalEnv(globals); this.fsPathToEnv.clear();