fix: address second round of review feedback

Author: karthiknadig

src/managers/conda/condaUtils.ts

@@ -512,10 +512,10 @@ async function buildShellActivationMapForConda(
         // P3: Handle Windows specifically ;this is carryover from vscode-python
         if (isWindows()) {
             logs.push('✓ Using Windows-specific activation configuration');
-            // Get conda.sh for bash-based shells (Git Bash, WSL bash)
+            // Get conda.sh for bash-based shells on Windows (e.g., Git Bash)
             const condaShPath = envManager.sourcingInformation.shellSourcingScripts?.sh;
             if (!condaShPath) {
-                logs.push('conda.sh not found, falling back to global sourcing script for bash activation');
+                logs.push('conda.sh not found, using preferred sourcing script path for bash activation');
             }
             shellMaps = await windowsExceptionGenerateConfig(
                 preferredSourcingPath,
@@ -607,14 +607,24 @@ export async function windowsExceptionGenerateConfig(
 
     // When condaShPath is available, it is an initialization script (conda.sh) and does not
     // itself activate an environment. In that case, first source conda.sh, then
-    // run "conda activate <envIdentifier>". When falling back to sourceInitPath,
-    // retain the existing single "source <activate-script> <env>" behavior.
-    const bashActivate: PythonCommandRunConfiguration[] = condaShPath
-        ? [
-              { executable: 'source', args: [condaShPath.replace(/\\/g, '/')] },
-              { executable: 'conda', args: ['activate', quotedPrefix] },
-          ]
-        : [{ executable: 'source', args: [sourceInitPath.replace(/\\/g, '/'), quotedPrefix] }];
+    // run "conda activate <envIdentifier>".
+    // When falling back to sourceInitPath, only emit a bash "source" command if the script
+    // is bash-compatible; on Windows, sourceInitPath may point to "activate.bat", which
+    // cannot be sourced by Git Bash, so in that case we skip emitting a Git Bash activation.
+    let bashActivate: PythonCommandRunConfiguration[];
+    if (condaShPath) {
+        bashActivate = [
+            { executable: 'source', args: [condaShPath.replace(/\\/g, '/')] },
+            { executable: 'conda', args: ['activate', quotedPrefix] },
+        ];
+    } else if (sourceInitPath.toLowerCase().endsWith('.bat')) {
+        traceVerbose(
+            `Skipping Git Bash activation fallback because sourceInitPath is a batch script: ${sourceInitPath}`,
+        );
+        bashActivate = [];
+    } else {
+        bashActivate = [{ executable: 'source', args: [sourceInitPath.replace(/\\/g, '/'), quotedPrefix] }];
+    }
     traceVerbose(
         `Windows activation commands: 
         PowerShell: ${JSON.stringify(pwshActivate)}, 

src/test/managers/conda/condaUtils.windowsActivation.unit.test.ts

@@ -9,7 +9,8 @@ import { windowsExceptionGenerateConfig } from '../../../managers/conda/condaUti
  *
  * Key behavior tested:
  * - Git Bash uses conda.sh (initialization script) + conda activate when condaShPath is available
- * - Git Bash falls back to source <activate-script> <env> when condaShPath is not available
+ * - Git Bash skips activation when condaShPath is not available and sourceInitPath is .bat
+ * - Git Bash falls back to source <activate-script> <env> when condaShPath is not available and source is not .bat
  * - PowerShell uses ps1 hook + conda activate
  * - CMD uses activate.bat + conda activate
  */
@@ -51,8 +52,8 @@ suite('Conda Utils - windowsExceptionGenerateConfig', () => {
             assert.deepStrictEqual(gitBashActivation[1].args, ['activate', 'myenv']);
         });
 
-        test('Falls back to single source command when condaShPath is undefined', async () => {
-            // Arrange
+        test('Skips Git Bash activation when condaShPath is undefined and sourceInitPath is .bat', async () => {
+            // Arrange: sourceInitPath is a .bat file which Git Bash cannot source
             getCondaHookPs1PathStub.resolves(undefined);
             const sourceInitPath = 'C:\\conda\\Scripts\\activate.bat';
             const prefix = 'myenv';
@@ -62,14 +63,35 @@ suite('Conda Utils - windowsExceptionGenerateConfig', () => {
             // Act
             const result = await windowsExceptionGenerateConfig(sourceInitPath, prefix, condaFolder, condaShPath);
 
+            // Assert: Git Bash activation should be empty since .bat cannot be sourced
+            const gitBashActivation = result.shellActivation.get(ShellConstants.GITBASH);
+            assert.ok(gitBashActivation, 'Git Bash activation should be defined');
+            assert.strictEqual(
+                gitBashActivation.length,
+                0,
+                'Git Bash activation should be empty when sourceInitPath is .bat',
+            );
+        });
+
+        test('Falls back to single source command when condaShPath is undefined and source is not .bat', async () => {
+            // Arrange: sourceInitPath is a bash-compatible script (no .bat extension)
+            getCondaHookPs1PathStub.resolves(undefined);
+            const sourceInitPath = 'C:\\conda\\Scripts\\activate'; // No .bat extension
+            const prefix = 'myenv';
+            const condaFolder = 'C:\\conda';
+            const condaShPath = undefined; // Not available
+
+            // Act
+            const result = await windowsExceptionGenerateConfig(sourceInitPath, prefix, condaFolder, condaShPath);
+
             // Assert
             const gitBashActivation = result.shellActivation.get(ShellConstants.GITBASH);
             assert.ok(gitBashActivation, 'Git Bash activation should be defined');
-            assert.strictEqual(gitBashActivation.length, 1, 'Should have 1 command when condaShPath not available');
+            assert.strictEqual(gitBashActivation.length, 1, 'Should have 1 command when source is bash-compatible');
 
             // Single command: source <activate-script> <env>
             assert.strictEqual(gitBashActivation[0].executable, 'source');
-            assert.deepStrictEqual(gitBashActivation[0].args, ['C:/conda/Scripts/activate.bat', 'myenv']);
+            assert.deepStrictEqual(gitBashActivation[0].args, ['C:/conda/Scripts/activate', 'myenv']);
         });
 
         test('Converts Windows backslashes to forward slashes for bash', async () => {