Always prepend to PATH instead of replacing it

src/client/interpreter/activation/terminalEnvVarCollectionService.ts

@@ -167,7 +167,7 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
             if (shouldSkip(key)) {
                 return;
             }
-            const value = env[key];
+            let value = env[key];
             const prevValue = processEnv[key];
             if (prevValue !== value) {
                 if (value !== undefined) {
@@ -180,6 +180,20 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
                         });
                         return;
                     }
+                    if (key === 'PATH') {
+                        if (processEnv.PATH && env.PATH?.endsWith(processEnv.PATH)) {
+                            // Prefer prepending to PATH instead of replacing it, as we do not want to replace any
+                            // changes to PATH users might have made it in their init scripts (~/.bashrc etc.)
+                            const prependedPart = env.PATH.slice(0, -processEnv.PATH.length);
+                            value = prependedPart;
+                            traceVerbose(`Prepending environment variable ${key} in collection with ${value}`);
+                            envVarCollection.prepend(key, value, {
+                                applyAtShellIntegration: true,
+                                applyAtProcessCreation: true,
+                            });
+                            return;
+                        }
+                    }
                     traceVerbose(`Setting environment variable ${key} in collection to ${value}`);
                     envVarCollection.replace(key, value, {
                         applyAtShellIntegration: true,

src/test/interpreters/activation/terminalEnvVarCollectionService.unit.test.ts

@@ -216,6 +216,38 @@ suite('Terminal Environment Variable Collection Service', () => {
         assert.deepEqual(opts, { applyAtProcessCreation: false, applyAtShellIntegration: true });
     });
 
+    test('Prepend PATH instead of replacing it, where possible', async () => {
+        const processEnv = { PATH: 'hello/1/2/3' };
+        reset(environmentActivationService);
+        when(environmentActivationService.getProcessEnvironmentVariables(anything(), anything())).thenResolve(
+            processEnv,
+        );
+        const prependedPart = 'path/to/activate/dir:';
+        const envVars: NodeJS.ProcessEnv = { PATH: `${prependedPart}${processEnv.PATH}` };
+        when(
+            environmentActivationService.getActivatedEnvironmentVariables(
+                anything(),
+                undefined,
+                undefined,
+                customShell,
+            ),
+        ).thenResolve(envVars);
+
+        when(collection.replace(anything(), anything(), anything())).thenResolve();
+        when(collection.delete(anything())).thenResolve();
+        let opts: EnvironmentVariableMutatorOptions | undefined;
+        when(collection.prepend('PATH', anything(), anything())).thenCall((_, _v, o) => {
+            opts = o;
+        });
+
+        await terminalEnvVarCollectionService._applyCollection(undefined, customShell);
+
+        verify(collection.clear()).once();
+        verify(collection.prepend('PATH', prependedPart, anything())).once();
+        verify(collection.replace('PATH', anything(), anything())).never();
+        assert.deepEqual(opts, { applyAtProcessCreation: true, applyAtShellIntegration: true });
+    });
+
     test('Verify envs are not applied if env activation is disabled', async () => {
         const envVars: NodeJS.ProcessEnv = { CONDA_PREFIX: 'prefix/to/conda', ...process.env };
         when(