fix feedback

Author: eleanorjboyd

src/client/chat/configurePythonEnvTool.ts

@@ -23,6 +23,7 @@ import {
     IResourceReference,
     isCancellationError,
     raceCancellationError,
+    waitForActiveEnvironmentChange,
 } from './utils';
 import { ITerminalHelper } from '../common/terminal/types';
 import { IRecommendedEnvironmentService } from '../interpreter/configuration/types';
@@ -133,7 +134,13 @@ export class ConfigurePythonEnvTool extends BaseTool<IConfigurePythonEnvToolArgu
         token: CancellationToken,
     ): Promise<LanguageModelToolResult> {
         traceVerbose(`${ConfigurePythonEnvTool.toolName}: setting environment directly from pythonPath: ${pythonPath}`);
+        // Subscribe to the change event BEFORE triggering the update so we don't miss it.
+        // updateActiveEnvironmentPath only persists the setting; the active interpreter switch
+        // is asynchronous, so we wait for the event before resolving env details to avoid
+        // returning details for the previously-active interpreter.
+        const activeChanged = waitForActiveEnvironmentChange(this.api, pythonPath, token);
         await raceCancellationError(this.api.updateActiveEnvironmentPath(pythonPath, resource), token);
+        await raceCancellationError(activeChanged, token);
         const envPath = this.api.getActiveEnvironmentPath(resource);
         const environment = await raceCancellationError(this.api.resolveEnvironment(envPath), token);
         return getEnvDetailsForResponse(

src/client/chat/createVirtualEnvTool.ts

@@ -45,7 +45,7 @@ import { hideEnvCreation } from '../pythonEnvironments/creation/provider/hideEnv
 import { BaseTool } from './baseTool';
 
 interface ICreateVirtualEnvToolParams extends IResourceReference {
-    packageList?: string[]; // Added only because we have ability to create a virtual env with list of packages same tool within the in Python Env extension.
+    packageList?: string[]; // Added only because we have the ability to create a virtual env with a list of packages using the same tool within the Python Env extension.
 }
 
 export class CreateVirtualEnvTool extends BaseTool<ICreateVirtualEnvToolParams>

src/client/chat/selectEnvTool.ts

@@ -26,6 +26,7 @@ import {
     getToolResponseIfNotebook,
     IResourceReference,
     raceCancellationError,
+    waitForActiveEnvironmentChange,
 } from './utils';
 import { ITerminalHelper } from '../common/terminal/types';
 import { raceTimeout } from '../common/utils/async';
@@ -72,15 +73,23 @@ export class SelectPythonEnvTool extends BaseTool<ISelectPythonEnvToolArguments>
         resource: Uri | undefined,
         token: CancellationToken,
     ): Promise<LanguageModelToolResult> {
+        const notebookResponse = getToolResponseIfNotebook(resource);
+        if (notebookResponse) {
+            return notebookResponse;
+        }
+
         // Fast path: if the caller provided a pythonPath, set it directly without any UI.
         if (options.input.pythonPath) {
             traceVerbose(
                 `${SelectPythonEnvTool.toolName}: setting environment directly from pythonPath: ${options.input.pythonPath}`,
             );
+            // Subscribe to the change event BEFORE triggering the update so we don't miss it.
+            const activeChanged = waitForActiveEnvironmentChange(this.api, options.input.pythonPath, token);
             await raceCancellationError(
                 this.api.updateActiveEnvironmentPath(options.input.pythonPath, resource),
                 token,
             );
+            await raceCancellationError(activeChanged, token);
             const env = await raceCancellationError(
                 this.api.resolveEnvironment(this.api.getActiveEnvironmentPath(resource)),
                 token,

src/client/chat/utils.ts

@@ -58,6 +58,41 @@ export function raceCancellationError<T>(promise: Promise<T>, token: Cancellatio
     });
 }
 
+/**
+ * Returns a promise that resolves once the active environment path changes to match the
+ * provided `pythonPath` (matched against either the event's `path` or `id`). Resolves early
+ * on cancellation or after `timeoutMs` to avoid hanging callers if the event is missed.
+ * Callers must subscribe via this helper BEFORE invoking `updateActiveEnvironmentPath` to
+ * avoid a race where the event fires before the listener is attached.
+ */
+export function waitForActiveEnvironmentChange(
+    api: PythonExtension['environments'],
+    pythonPath: string,
+    token: CancellationToken,
+    timeoutMs = 5000,
+): Promise<void> {
+    return new Promise<void>((resolve) => {
+        let settled = false;
+        const settle = () => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            listener.dispose();
+            cancelRef.dispose();
+            clearTimeout(timer);
+            resolve();
+        };
+        const listener = api.onDidChangeActiveEnvironmentPath((e) => {
+            if (e.path === pythonPath || e.id === pythonPath) {
+                settle();
+            }
+        });
+        const cancelRef = token.onCancellationRequested(() => settle());
+        const timer = setTimeout(() => settle(), timeoutMs);
+    });
+}
+
 export async function getEnvDisplayName(
     discovery: IDiscoveryAPI,
     resource: Uri | undefined,