Merge branch 'main' into resonant-duck

Author: eleanorjboyd

build/azure-pipeline.stable.yml

@@ -128,7 +128,7 @@ extends:
           project: 'Monaco'
           definition: 593
           buildVersionToDownload: 'latestFromBranch'
-          branchName: 'refs/heads/release/2025.14'
+          branchName: 'refs/heads/release/2025.16'
           targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
           artifactName: 'bin-$(buildTarget)'
           itemPattern: |

package-lock.json

@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "Python language support with extension access points for IntelliSense (Pylance), Debugging (Python Debugger), linting, formatting, refactoring, unit tests, and more.",
-    "version": "2025.19.0-dev",
+    "version": "2025.21.0-dev",
     "featureFlags": {
         "usingNewInterpreterStorage": true
     },

package.json

@@ -19,21 +19,29 @@ import { JUPYTER_EXTENSION_ID, NotebookCellScheme } from '../common/constants';
 import { dirname, join } from 'path';
 import { resolveEnvironment, useEnvExtension } from '../envExt/api.internal';
 import { ErrorWithTelemetrySafeReason } from '../common/errors/errorUtils';
+import { getWorkspaceFolders } from '../common/vscodeApis/workspaceApis';
 
 export interface IResourceReference {
     resourcePath?: string;
 }
 
 export function resolveFilePath(filepath?: string): Uri | undefined {
     if (!filepath) {
-        return workspace.workspaceFolders ? workspace.workspaceFolders[0].uri : undefined;
+        const folders = getWorkspaceFolders() ?? [];
+        return folders.length > 0 ? folders[0].uri : undefined;
     }
-    // starts with a scheme
-    try {
-        return Uri.parse(filepath);
-    } catch (e) {
-        return Uri.file(filepath);
+    // Check if it's a URI with a scheme (contains "://")
+    // This handles schemes like "file://", "vscode-notebook://", etc.
+    // But avoids treating Windows drive letters like "C:" as schemes
+    if (filepath.includes('://')) {
+        try {
+            return Uri.parse(filepath);
+        } catch {
+            return Uri.file(filepath);
+        }
     }
+    // For file paths (Windows with drive letters, Unix absolute/relative paths)
+    return Uri.file(filepath);
 }
 
 /**

src/client/chat/utils.ts

@@ -20,12 +20,9 @@ import {
     TerminalShellType,
 } from './types';
 import { traceVerbose } from '../../logging';
-import { getConfiguration } from '../vscodeApis/workspaceApis';
 import { useEnvExtension } from '../../envExt/api.internal';
 import { ensureTerminalLegacy } from '../../envExt/api.legacy';
 import { sleep } from '../utils/async';
-import { isWindows } from '../utils/platform';
-import { getPythonMinorVersion } from '../../repl/replUtils';
 
 @injectable()
 export class TerminalService implements ITerminalService, Disposable {
@@ -108,20 +105,10 @@ export class TerminalService implements ITerminalService, Disposable {
             await promise;
         }
 
-        const config = getConfiguration('python');
-        const pythonrcSetting = config.get<boolean>('terminal.shellIntegration.enabled');
-
-        const minorVersion = this.options?.resource
-            ? await getPythonMinorVersion(
-                  this.options.resource,
-                  this.serviceContainer.get<IInterpreterService>(IInterpreterService),
-              )
-            : undefined;
-
-        if ((isPythonShell && !pythonrcSetting) || (isPythonShell && isWindows()) || (minorVersion ?? 0) >= 13) {
-            // If user has explicitly disabled SI for Python, use sendText for inside Terminal REPL.
+        if (isPythonShell) {
+            // Prevent KeyboardInterrupt in Python REPL: https://github.com/microsoft/vscode-python/issues/25468
             terminal.sendText(commandLine);
-            return undefined;
+            traceVerbose(`Python REPL detected, sendText: ${commandLine}`);
         } else if (terminal.shellIntegration) {
             const execution = terminal.shellIntegration.executeCommand(commandLine);
             traceVerbose(`Shell Integration is enabled, executeCommand: ${commandLine}`);