Merge branch 'main' into dependabot/pip/typing-extensions-4.16.0

Author: eleanorjboyd

.github/workflows/build.yml

@@ -130,7 +130,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Use Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
@@ -184,7 +184,7 @@ jobs:
           persist-credentials: false
 
       - name: Use Python ${{ matrix.python }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python }}
 
@@ -255,7 +255,7 @@ jobs:
         run: npx @vscode/l10n-dev@latest export ./src
 
       - name: Install Python ${{ matrix.python }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python }}
 

.github/workflows/gen-issue-velocity.yml

@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.x'
 

.github/workflows/pr-check.yml

@@ -101,7 +101,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Use Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
@@ -168,7 +168,7 @@ jobs:
           persist-credentials: false
 
       - name: Use Python ${{ matrix.python }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python }}
 
@@ -248,7 +248,7 @@ jobs:
         run: npx @vscode/l10n-dev@latest export ./src
 
       - name: Use Python ${{ matrix.python }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python }}
 
@@ -521,7 +521,7 @@ jobs:
         run: npx @vscode/l10n-dev@latest export ./src
 
       - name: Use Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: 'pip'

package.json

@@ -1593,7 +1593,7 @@
             {
                 "name": "configure_python_environment",
                 "displayName": "Configure Python Environment",
-                "modelDescription": "This tool configures a Python environment in the given workspace. ALWAYS Use this tool to set up the user's chosen environment and ALWAYS call this tool before using any other Python related tools or running any Python command in the terminal. IMPORTANT: This tool is only for Python environments (venv, virtualenv, conda, pipenv, poetry, pyenv, pixi, or any other Python environment manager). Do not use this tool for npm packages, system packages, Ruby gems, or any other non-Python dependencies.",
+                "modelDescription": "This tool configures a Python environment in the given workspace. ALWAYS Use this tool to set up the user's chosen environment and ALWAYS call this tool before using any other Python related tools or running any Python command in the terminal. If you already know which Python interpreter to use (e.g. from a previous tool call or user message), pass it as 'pythonPath' to skip interactive prompts and configure the environment automatically. IMPORTANT: This tool is only for Python environments (venv, virtualenv, conda, pipenv, poetry, pyenv, pixi, or any other Python environment manager). Do not use this tool for npm packages, system packages, Ruby gems, or any other non-Python dependencies.",
                 "userDescription": "%python.languageModelTools.configure_python_environment.userDescription%",
                 "toolReferenceName": "configurePythonEnvironment",
                 "tags": [
@@ -1609,6 +1609,10 @@
                         "resourcePath": {
                             "type": "string",
                             "description": "The path to the Python file or workspace for which a Python Environment needs to be configured."
+                        },
+                        "pythonPath": {
+                            "type": "string",
+                            "description": "Optional absolute path to a Python interpreter to use. When provided, the environment is configured automatically without any interactive prompts. Use this to avoid blocking the session on user input."
                         }
                     },
                     "required": []

src/client/chat/configurePythonEnvTool.ts

@@ -23,15 +23,28 @@ import {
     IResourceReference,
     isCancellationError,
     raceCancellationError,
+    setEnvironmentDirectlyByPath,
 } from './utils';
 import { ITerminalHelper } from '../common/terminal/types';
 import { IRecommendedEnvironmentService } from '../interpreter/configuration/types';
 import { CreateVirtualEnvTool } from './createVirtualEnvTool';
 import { ISelectPythonEnvToolArguments, SelectPythonEnvTool } from './selectEnvTool';
 import { BaseTool } from './baseTool';
+import { traceVerbose } from '../logging';
+import { ErrorWithTelemetrySafeReason } from '../common/errors/errorUtils';
 
-export class ConfigurePythonEnvTool extends BaseTool<IResourceReference>
-    implements LanguageModelTool<IResourceReference> {
+export interface IConfigurePythonEnvToolArguments extends IResourceReference {
+    /**
+     * Optional path to a Python interpreter. When provided, the tool sets this
+     * interpreter directly without any user interaction (no Quick Pick, no
+     * create-venv prompt). This is the recommended way for Copilot to call
+     * the tool in autopilot / bypass-approvals mode.
+     */
+    pythonPath?: string;
+}
+
+export class ConfigurePythonEnvTool extends BaseTool<IConfigurePythonEnvToolArguments>
+    implements LanguageModelTool<IConfigurePythonEnvToolArguments> {
     private readonly terminalExecutionService: TerminalCodeExecutionProvider;
     private readonly terminalHelper: ITerminalHelper;
     private readonly recommendedEnvService: IRecommendedEnvironmentService;
@@ -53,7 +66,7 @@ export class ConfigurePythonEnvTool extends BaseTool<IResourceReference>
     }
 
     async invokeImpl(
-        options: LanguageModelToolInvocationOptions<IResourceReference>,
+        options: LanguageModelToolInvocationOptions<IConfigurePythonEnvToolArguments>,
         resource: Uri | undefined,
         token: CancellationToken,
     ): Promise<LanguageModelToolResult> {
@@ -63,6 +76,11 @@ export class ConfigurePythonEnvTool extends BaseTool<IResourceReference>
             return notebookResponse;
         }
 
+        // Fast path: if the caller provided a pythonPath, set it directly without any UI.
+        if (options.input.pythonPath) {
+            return this.setEnvironmentDirectly(options.input.pythonPath, resource, token);
+        }
+
         const workspaceSpecificEnv = await raceCancellationError(
             this.hasAlreadyGotAWorkspaceSpecificEnvironment(resource),
             token,
@@ -107,8 +125,37 @@ export class ConfigurePythonEnvTool extends BaseTool<IResourceReference>
         }
     }
 
+    /**
+     * Sets the given interpreter path directly without user interaction, then
+     * resolves and returns the environment details.
+     */
+    private async setEnvironmentDirectly(
+        pythonPath: string,
+        resource: Uri | undefined,
+        token: CancellationToken,
+    ): Promise<LanguageModelToolResult> {
+        traceVerbose(`${ConfigurePythonEnvTool.toolName}: setting environment directly from pythonPath: ${pythonPath}`);
+        const result = await setEnvironmentDirectlyByPath(pythonPath, this.api, resource, token);
+        if (result) {
+            this.extraTelemetryProperties.resolveOutcome = 'providedEnv';
+            this.extraTelemetryProperties.envType = getEnvTypeForTelemetry(result);
+            return getEnvDetailsForResponse(
+                result,
+                this.api,
+                this.terminalExecutionService,
+                this.terminalHelper,
+                resource,
+                token,
+            );
+        }
+        throw new ErrorWithTelemetrySafeReason(
+            `No environment found for the provided pythonPath '${pythonPath}'.`,
+            'noEnvFound',
+        );
+    }
+
     async prepareInvocationImpl(
-        _options: LanguageModelToolInvocationPrepareOptions<IResourceReference>,
+        _options: LanguageModelToolInvocationPrepareOptions<IConfigurePythonEnvToolArguments>,
         _resource: Uri | undefined,
         _token: CancellationToken,
     ): Promise<PreparedToolInvocation> {

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 becausewe 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>
@@ -92,12 +92,17 @@ export class CreateVirtualEnvTool extends BaseTool<ICreateVirtualEnvToolParams>
 
             let createdEnvPath: string | undefined = undefined;
             if (useEnvExtension()) {
-                const result: PythonEnvironment | undefined = await commands.executeCommand('python-envs.createAny', {
-                    quickCreate: true,
-                    additionalPackages: options.input.packageList || [],
-                    uri: workspaceFolder.uri,
-                    selectEnvironment: true,
-                });
+                const result: PythonEnvironment | undefined = await raceCancellationError(
+                    Promise.resolve(
+                        commands.executeCommand<PythonEnvironment | undefined>('python-envs.createAny', {
+                            quickCreate: true,
+                            additionalPackages: options.input.packageList || [],
+                            uri: workspaceFolder.uri,
+                            selectEnvironment: true,
+                        }),
+                    ),
+                    token,
+                );
                 createdEnvPath = result?.environmentPath.fsPath;
             } else {
                 const created = await raceCancellationError(
@@ -116,19 +121,19 @@ export class CreateVirtualEnvTool extends BaseTool<ICreateVirtualEnvToolParams>
 
             // Wait a few secs to ensure the env is selected as the active environment..
             // If this doesn't work, then something went wrong.
-            await raceTimeout(5_000, interpreterChanged);
+            await raceCancellationError(raceTimeout(5_000, interpreterChanged), token);
 
             const stopWatch = new StopWatch();
             let env: ResolvedEnvironment | undefined;
-            while (stopWatch.elapsedTime < 5_000 || !env) {
-                env = await this.api.resolveEnvironment(createdEnvPath);
+            while (stopWatch.elapsedTime < 5_000 && !env) {
+                env = await raceCancellationError(this.api.resolveEnvironment(createdEnvPath), token);
                 if (env) {
                     break;
                 } else {
                     traceVerbose(
                         `${CreateVirtualEnvTool.toolName} tool invoked, env created but not yet resolved, waiting...`,
                     );
-                    await sleep(200);
+                    await raceCancellationError(sleep(200), token);
                 }
             }
             if (!env) {

src/client/chat/selectEnvTool.ts

@@ -25,6 +25,7 @@ import {
     getEnvDetailsForResponse,
     getToolResponseIfNotebook,
     IResourceReference,
+    raceCancellationError,
 } from './utils';
 import { ITerminalHelper } from '../common/terminal/types';
 import { raceTimeout } from '../common/utils/async';
@@ -67,20 +68,26 @@ export class SelectPythonEnvTool extends BaseTool<ISelectPythonEnvToolArguments>
         let selected: boolean | undefined = false;
         const hasVenvOrCondaEnvInWorkspaceFolder = doesWorkspaceHaveVenvOrCondaEnv(resource, this.api);
         if (options.input.reason === 'cancelled' || hasVenvOrCondaEnvInWorkspaceFolder) {
-            const result = (await Promise.resolve(
-                commands.executeCommand(Commands.Set_Interpreter, {
-                    hideCreateVenv: false,
-                    showBackButton: false,
-                }),
-            )) as SelectEnvironmentResult | undefined;
+            const result = await raceCancellationError(
+                Promise.resolve(
+                    commands.executeCommand(Commands.Set_Interpreter, {
+                        hideCreateVenv: false,
+                        showBackButton: false,
+                    }),
+                ) as Promise<SelectEnvironmentResult | undefined>,
+                token,
+            );
             if (result?.path) {
                 traceVerbose(`User selected a Python environment ${result.path} in Select Python Tool.`);
                 selected = true;
             } else {
                 traceWarn(`User did not select a Python environment in Select Python Tool.`);
             }
         } else {
-            selected = await showCreateAndSelectEnvironmentQuickPick(resource, this.serviceContainer);
+            selected = await raceCancellationError(
+                showCreateAndSelectEnvironmentQuickPick(resource, this.serviceContainer, token),
+                token,
+            );
             if (selected) {
                 traceVerbose(`User selected a Python environment ${selected} in Select Python Tool(2).`);
             } else {
@@ -152,6 +159,7 @@ export class SelectPythonEnvTool extends BaseTool<ISelectPythonEnvToolArguments>
 async function showCreateAndSelectEnvironmentQuickPick(
     uri: Uri | undefined,
     serviceContainer: IServiceContainer,
+    token: CancellationToken,
 ): Promise<boolean | undefined> {
     const createLabel = `${Octicons.Add} ${InterpreterQuickPickList.create.label}`;
     const selectLabel = l10n.t('Select an existing Python Environment');
@@ -161,11 +169,15 @@ async function showCreateAndSelectEnvironmentQuickPick(
         { label: selectLabel },
     ];
 
-    const selectedItem = await showQuickPick(items, {
-        placeHolder: l10n.t('Configure a Python Environment'),
-        matchOnDescription: true,
-        ignoreFocusOut: true,
-    });
+    const selectedItem = await showQuickPick(
+        items,
+        {
+            placeHolder: l10n.t('Configure a Python Environment'),
+            matchOnDescription: true,
+            ignoreFocusOut: true,
+        },
+        token,
+    );
 
     if (selectedItem && !Array.isArray(selectedItem) && selectedItem.label === createLabel) {
         const disposables = new DisposableStore();
@@ -187,7 +199,7 @@ async function showCreateAndSelectEnvironmentQuickPick(
             );
 
             if (created?.action === 'Back') {
-                return showCreateAndSelectEnvironmentQuickPick(uri, serviceContainer);
+                return showCreateAndSelectEnvironmentQuickPick(uri, serviceContainer, token);
             }
             if (created?.action === 'Cancel') {
                 return undefined;
@@ -206,7 +218,7 @@ async function showCreateAndSelectEnvironmentQuickPick(
             commands.executeCommand(Commands.Set_Interpreter, { hideCreateVenv: true, showBackButton: true }),
         )) as SelectEnvironmentResult | undefined;
         if (result?.action === 'Back') {
-            return showCreateAndSelectEnvironmentQuickPick(uri, serviceContainer);
+            return showCreateAndSelectEnvironmentQuickPick(uri, serviceContainer, token);
         }
         if (result?.action === 'Cancel') {
             return undefined;