Merge branch 'main' into copilot/fix-multi-root-workspace-settings

Author: edvilme

examples/sample1/src/api.ts

@@ -818,10 +818,14 @@ export interface PythonEnvironmentManagerRegistrationApi {
      * Register an environment manager implementation.
      *
      * @param manager Environment Manager implementation to register.
+     * @param options Optional registration options.
+     * @param options.extensionId The extension ID of the calling extension. This is used as a fallback when
+     * automatic extension detection fails, such as during F5 debugging where the extension's file path
+     * does not contain its marketplace ID. If automatic detection succeeds, this value is ignored.
      * @returns A disposable that can be used to unregister the environment manager.
      * @see {@link EnvironmentManager}
      */
-    registerEnvironmentManager(manager: EnvironmentManager): Disposable;
+    registerEnvironmentManager(manager: EnvironmentManager, options?: { extensionId?: string }): Disposable;
 }
 
 export interface PythonEnvironmentItemApi {
@@ -922,10 +926,14 @@ export interface PythonPackageManagerRegistrationApi {
      * Register a package manager implementation.
      *
      * @param manager Package Manager implementation to register.
+     * @param options Optional registration options.
+     * @param options.extensionId The extension ID of the calling extension. This is used as a fallback when
+     * automatic extension detection fails, such as during F5 debugging where the extension's file path
+     * does not contain its marketplace ID. If automatic detection succeeds, this value is ignored.
      * @returns A disposable that can be used to unregister the package manager.
      * @see {@link PackageManager}
      */
-    registerPackageManager(manager: PackageManager): Disposable;
+    registerPackageManager(manager: PackageManager, options?: { extensionId?: string }): Disposable;
 }
 
 export interface PythonPackageGetterApi {

pythonEnvironmentsApi/src/main.ts

@@ -842,10 +842,14 @@ export interface PythonEnvironmentManagerRegistrationApi {
      * Register an environment manager implementation.
      *
      * @param manager Environment Manager implementation to register.
+     * @param options Optional registration options.
+     * @param options.extensionId The extension ID of the calling extension. This is used as a fallback when
+     * automatic extension detection fails, such as during F5 debugging where the extension's file path
+     * does not contain its marketplace ID. If automatic detection succeeds, this value is ignored.
      * @returns A disposable that can be used to unregister the environment manager.
      * @see {@link EnvironmentManager}
      */
-    registerEnvironmentManager(manager: EnvironmentManager): Disposable;
+    registerEnvironmentManager(manager: EnvironmentManager, options?: { extensionId?: string }): Disposable;
 }
 
 export interface PythonEnvironmentItemApi {
@@ -947,10 +951,14 @@ export interface PythonPackageManagerRegistrationApi {
      * Register a package manager implementation.
      *
      * @param manager Package Manager implementation to register.
+     * @param options Optional registration options.
+     * @param options.extensionId The extension ID of the calling extension. This is used as a fallback when
+     * automatic extension detection fails, such as during F5 debugging where the extension's file path
+     * does not contain its marketplace ID. If automatic detection succeeds, this value is ignored.
      * @returns A disposable that can be used to unregister the package manager.
      * @see {@link PackageManager}
      */
-    registerPackageManager(manager: PackageManager): Disposable;
+    registerPackageManager(manager: PackageManager, options?: { extensionId?: string }): Disposable;
 }
 
 export interface PythonPackageGetterApi {

src/api.ts

@@ -836,10 +836,14 @@ export interface PythonEnvironmentManagerRegistrationApi {
      * Register an environment manager implementation.
      *
      * @param manager Environment Manager implementation to register.
+     * @param options Optional registration options.
+     * @param options.extensionId The extension ID of the calling extension. This is used as a fallback when
+     * automatic extension detection fails, such as during F5 debugging where the extension's file path
+     * does not contain its marketplace ID. If automatic detection succeeds, this value is ignored.
      * @returns A disposable that can be used to unregister the environment manager.
      * @see {@link EnvironmentManager}
      */
-    registerEnvironmentManager(manager: EnvironmentManager): Disposable;
+    registerEnvironmentManager(manager: EnvironmentManager, options?: { extensionId?: string }): Disposable;
 }
 
 export interface PythonEnvironmentItemApi {
@@ -941,10 +945,14 @@ export interface PythonPackageManagerRegistrationApi {
      * Register a package manager implementation.
      *
      * @param manager Package Manager implementation to register.
+     * @param options Optional registration options.
+     * @param options.extensionId The extension ID of the calling extension. This is used as a fallback when
+     * automatic extension detection fails, such as during F5 debugging where the extension's file path
+     * does not contain its marketplace ID. If automatic detection succeeds, this value is ignored.
      * @returns A disposable that can be used to unregister the package manager.
      * @see {@link PackageManager}
      */
-    registerPackageManager(manager: PackageManager): Disposable;
+    registerPackageManager(manager: PackageManager, options?: { extensionId?: string }): Disposable;
 }
 
 export interface PythonPackageGetterApi {

src/common/utils/frameUtils.ts

@@ -28,7 +28,7 @@ function getPathFromFrame(frame: FrameData): string {
     return frame.filePath;
 }
 
-export function getCallingExtension(): string {
+export function getCallingExtension(extensionIdHint?: string): string {
     const pythonExts = [ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID];
     const extensions = allExtensions();
     const otherExts = extensions.filter((ext) => !pythonExts.includes(ext.id));
@@ -94,6 +94,19 @@ export function getCallingExtension(): string {
         }
     }
 
+    // Use the provided extensionId hint as a fallback (e.g., during F5 debugging where
+    // stack-based detection fails because the file path doesn't contain the extension ID).
+    // Only accept the hint if it matches an actually loaded extension for safety.
+    if (extensionIdHint) {
+        const hintExt = extensions.find((ext) => ext.id === extensionIdHint);
+        if (hintExt) {
+            traceVerbose(`Using provided extensionId hint: ${extensionIdHint}`);
+            extensionIdCache.set(cacheKey, extensionIdHint);
+            return extensionIdHint;
+        }
+        traceWarn(`Provided extensionId hint '${extensionIdHint}' not found in loaded extensions, ignoring`);
+    }
+
     // Fallback - we're likely being called from Python extension or built-in managers
     traceWarn(
         `Could not determine calling extension from stack frames. ` +

src/features/envManagers.ts

@@ -40,12 +40,12 @@ import {
     setAllManagerSettings,
 } from './settings/settingHelpers';
 
-function generateId(name: string): string {
+function generateId(name: string, extensionId?: string): string {
     const newName = name.toLowerCase().replace(/[^a-zA-Z0-9-_]/g, '_');
     if (name !== newName) {
         traceVerbose(`Environment manager name "${name}"  was normalized to "${newName}"`);
     }
-    return `${getCallingExtension()}:${newName}`;
+    return `${getCallingExtension(extensionId)}:${newName}`;
 }
 
 export class PythonEnvironmentManagers implements EnvironmentManagers {
@@ -71,9 +71,9 @@ export class PythonEnvironmentManagers implements EnvironmentManagers {
 
     constructor(private readonly pm: PythonProjectManager) {}
 
-    public registerEnvironmentManager(manager: EnvironmentManager): Disposable {
+    public registerEnvironmentManager(manager: EnvironmentManager, options?: { extensionId?: string }): Disposable {
         const registrationStopWatch = new StopWatch();
-        const managerId = generateId(manager.name);
+        const managerId = generateId(manager.name, options?.extensionId);
         if (this._environmentManagers.has(managerId)) {
             const ex = new EnvironmentManagerAlreadyRegisteredError(
                 `Environment manager with id ${managerId} already registered`,
@@ -119,8 +119,8 @@ export class PythonEnvironmentManagers implements EnvironmentManagers {
         });
     }
 
-    public registerPackageManager(manager: PackageManager): Disposable {
-        const managerId = generateId(manager.name);
+    public registerPackageManager(manager: PackageManager, options?: { extensionId?: string }): Disposable {
+        const managerId = generateId(manager.name, options?.extensionId);
         if (this._packageManagers.has(managerId)) {
             const ex = new PackageManagerAlreadyRegisteredError(
                 `Package manager with id ${managerId} already registered`,

src/features/pythonApi.ts

@@ -82,9 +82,9 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi {
         );
     }
 
-    registerEnvironmentManager(manager: EnvironmentManager): Disposable {
+    registerEnvironmentManager(manager: EnvironmentManager, options?: { extensionId?: string }): Disposable {
         const disposables: Disposable[] = [];
-        disposables.push(this.envManagers.registerEnvironmentManager(manager));
+        disposables.push(this.envManagers.registerEnvironmentManager(manager, options));
         if (manager.onDidChangeEnvironments) {
             disposables.push(manager.onDidChangeEnvironments((e) => this._onDidChangeEnvironments.fire(e)));
         }
@@ -233,9 +233,9 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi {
         return await handlePythonPath(context, this.envManagers.managers, projectEnvManagers);
     }
 
-    registerPackageManager(manager: PackageManager): Disposable {
+    registerPackageManager(manager: PackageManager, options?: { extensionId?: string }): Disposable {
         const disposables: Disposable[] = [];
-        disposables.push(this.envManagers.registerPackageManager(manager));
+        disposables.push(this.envManagers.registerPackageManager(manager, options));
         if (manager.onDidChangePackages) {
             disposables.push(manager.onDidChangePackages((e) => this._onDidChangePackages.fire(e)));
         }

src/internal.api.ts

@@ -76,8 +76,8 @@ export interface InternalDidChangeEnvironmentsEventArgs {
 }
 
 export interface EnvironmentManagers extends Disposable {
-    registerEnvironmentManager(manager: EnvironmentManager): Disposable;
-    registerPackageManager(manager: PackageManager): Disposable;
+    registerEnvironmentManager(manager: EnvironmentManager, options?: { extensionId?: string }): Disposable;
+    registerPackageManager(manager: PackageManager, options?: { extensionId?: string }): Disposable;
 
     /**
      * This event is fired when any environment manager changes its collection of environments.

src/managers/common/nativePythonFinder.ts

@@ -260,10 +260,11 @@ class NativePythonFinderImpl implements NativePythonFinder {
             this.restartAttempts = 0;
             return environment;
         } catch (ex) {
-            // On resolve timeout (not configure — configure handles its own timeout),
+            // On resolve timeout or connection error (not configure — configure handles its own timeout),
             // kill the hung process so next request triggers restart
-            if (ex instanceof RpcTimeoutError && ex.method !== 'configure') {
-                this.outputChannel.warn('[pet] Resolve request timed out, killing hung process for restart');
+            if ((ex instanceof RpcTimeoutError && ex.method !== 'configure') || ex instanceof rpc.ConnectionError) {
+                const reason = ex instanceof rpc.ConnectionError ? 'crashed' : 'timed out';
+                this.outputChannel.warn(`[pet] Resolve request ${reason}, killing process for restart`);
                 this.killProcess();
                 this.processExited = true;
             }
@@ -574,11 +575,14 @@ class NativePythonFinderImpl implements NativePythonFinder {
             } catch (ex) {
                 lastError = ex;
 
-                // Only retry on timeout errors
-                if (ex instanceof RpcTimeoutError && ex.method !== 'configure') {
+                // Retry on timeout or connection errors (PET hung or crashed mid-request)
+                const isRetryable =
+                    (ex instanceof RpcTimeoutError && ex.method !== 'configure') || ex instanceof rpc.ConnectionError;
+                if (isRetryable) {
                     if (attempt < MAX_REFRESH_RETRIES) {
+                        const reason = ex instanceof rpc.ConnectionError ? 'crashed' : 'timed out';
                         this.outputChannel.warn(
-                            `[pet] Refresh timed out (attempt ${attempt + 1}/${MAX_REFRESH_RETRIES + 1}), restarting and retrying...`,
+                            `[pet] Refresh ${reason} (attempt ${attempt + 1}/${MAX_REFRESH_RETRIES + 1}), restarting and retrying...`,
                         );
                         // Kill and restart for retry
                         this.killProcess();
@@ -588,7 +592,7 @@ class NativePythonFinderImpl implements NativePythonFinder {
                     // Final attempt failed
                     this.outputChannel.error(`[pet] Refresh failed after ${MAX_REFRESH_RETRIES + 1} attempts`);
                 }
-                // Non-timeout errors or final timeout - rethrow
+                // Non-retryable errors or final attempt - rethrow
                 throw ex;
             }
         }
@@ -652,10 +656,11 @@ class NativePythonFinderImpl implements NativePythonFinder {
                 this.outputChannel.info(`[pet] Refresh succeeded on retry attempt ${attempt + 1}`);
             }
         } catch (ex) {
-            // On refresh timeout (not configure — configure handles its own timeout),
+            // On refresh timeout or connection error (not configure — configure handles its own timeout),
             // kill the hung process so next request triggers restart
-            if (ex instanceof RpcTimeoutError && ex.method !== 'configure') {
-                this.outputChannel.warn('[pet] Request timed out, killing hung process for restart');
+            if ((ex instanceof RpcTimeoutError && ex.method !== 'configure') || ex instanceof rpc.ConnectionError) {
+                const reason = ex instanceof rpc.ConnectionError ? 'crashed' : 'timed out';
+                this.outputChannel.warn(`[pet] PET process ${reason}, killing for restart`);
                 this.killProcess();
                 this.processExited = true;
             }