Updates

Author: DonJayamanne

src/client/chat/configurePythonEnvTool.ts

@@ -27,7 +27,7 @@ import { resolveFilePath } from './utils';
 import { ITerminalHelper } from '../common/terminal/types';
 import { IRecommendedEnvironmentService } from '../interpreter/configuration/types';
 import { CreateVirtualEnvTool } from './createVirtualEnvTool';
-import { SelectPythonEnvTool } from './selectEnvTool';
+import { ISelectPythonEnvToolArguments, SelectPythonEnvTool } from './selectEnvTool';
 
 export class ConfigurePythonEnvTool implements LanguageModelTool<IResourceReference> {
     private readonly terminalExecutionService: TerminalCodeExecutionProvider;
@@ -37,7 +37,7 @@ export class ConfigurePythonEnvTool implements LanguageModelTool<IResourceRefere
     constructor(
         private readonly api: PythonExtension['environments'],
         private readonly serviceContainer: IServiceContainer,
-        private readonly createVirtualEnvTool: CreateVirtualEnvTool,
+        private readonly createEnvTool: CreateVirtualEnvTool,
     ) {
         this.terminalExecutionService = this.serviceContainer.get<TerminalCodeExecutionProvider>(
             ICodeExecutionService,
@@ -75,22 +75,26 @@ export class ConfigurePythonEnvTool implements LanguageModelTool<IResourceRefere
             );
         }
 
-        let reason: 'cancelled' | undefined;
-        if (
-            await this.createVirtualEnvTool.canCreateNewVirtualEnv(resolveFilePath(options.input.resourcePath), token)
-        ) {
-            reason = 'cancelled';
+        if (await this.createEnvTool.shouldCreateNewVirtualEnv(resource, token)) {
             try {
                 return await lm.invokeTool(CreateVirtualEnvTool.toolName, options, token);
             } catch (ex) {
-                // If the user cancelled the tool, then we should not invoke the select env tool.
-                if (!isCancellationError(ex)) {
-                    throw ex;
+                if (isCancellationError(ex)) {
+                    const input: ISelectPythonEnvToolArguments = {
+                        ...options.input,
+                        reason: 'cancelled',
+                    };
+                    // If the user cancelled the tool, then we should invoke the select env tool.
+                    return lm.invokeTool(SelectPythonEnvTool.toolName, { ...options, input }, token);
                 }
+                throw ex;
             }
+        } else {
+            const input: ISelectPythonEnvToolArguments = {
+                ...options.input,
+            };
+            return lm.invokeTool(SelectPythonEnvTool.toolName, { ...options, input }, token);
         }
-
-        return lm.invokeTool(SelectPythonEnvTool.toolName, { ...options, input: { ...options.input, reason } }, token);
     }
 
     async prepareInvocation?(

src/client/chat/createVirtualEnvTool.ts

@@ -135,7 +135,7 @@ export class CreateVirtualEnvTool implements LanguageModelTool<IResourceReferenc
         }
     }
 
-    public async canCreateNewVirtualEnv(resource: Uri | undefined, token: CancellationToken): Promise<boolean> {
+    public async shouldCreateNewVirtualEnv(resource: Uri | undefined, token: CancellationToken): Promise<boolean> {
         if (doesWorkspaceHaveVenvOrCondaEnv(resource, this.api)) {
             // If we already have a .venv or .conda in this workspace, then do not prompt to create a virtual environment.
             return false;

src/client/chat/selectEnvTool.ts

@@ -38,7 +38,7 @@ import { showQuickPick } from '../common/vscodeApis/windowApis';
 import { DisposableStore } from '../common/utils/resourceLifecycle';
 import { traceError, traceVerbose, traceWarn } from '../logging';
 
-interface ISelectPythonEnvToolArguments extends IResourceReference {
+export interface ISelectPythonEnvToolArguments extends IResourceReference {
     reason?: 'cancelled';
 }