fix: use conda.sh for Git Bash activation on Windows (Fixes #1247)

Author: karthiknadig

src/managers/conda/condaSourcingUtils.ts

@@ -6,6 +6,16 @@ import * as path from 'path';
 import { traceError, traceInfo, traceVerbose } from '../../common/logging';
 import { isWindows } from '../../common/utils/platformUtils';
 
+/**
+ * Indices for shell-specific sourcing scripts in shellSourcingScripts array.
+ * The array is populated by findShellSourcingScripts in this order.
+ */
+export const SHELL_SOURCING_SCRIPT_INDEX = {
+    PS1: 0, // PowerShell hook (conda-hook.ps1)
+    SH: 1, // Bash/sh script (conda.sh)
+    CMD: 2, // CMD batch file (activate.bat)
+} as const;
+
 /**
  * Represents the status of conda sourcing in the current environment
  */

src/managers/conda/condaUtils.ts

@@ -55,7 +55,7 @@ import { selectFromCommonPackagesToInstall } from '../common/pickers';
 import { Installable } from '../common/types';
 import { shortVersion, sortEnvironments } from '../common/utils';
 import { CondaEnvManager } from './condaEnvManager';
-import { getCondaHookPs1Path, getLocalActivationScript } from './condaSourcingUtils';
+import { getCondaHookPs1Path, getLocalActivationScript, SHELL_SOURCING_SCRIPT_INDEX } from './condaSourcingUtils';
 import { createStepBasedCondaFlow } from './condaStepBasedFlow';
 
 export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`;
@@ -512,10 +512,16 @@ 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)
+            const condaShPath = envManager.sourcingInformation.shellSourcingScripts?.[SHELL_SOURCING_SCRIPT_INDEX.SH];
+            if (!condaShPath) {
+                logs.push('conda.sh not found, falling back to global sourcing script for bash activation');
+            }
             shellMaps = await windowsExceptionGenerateConfig(
                 preferredSourcingPath,
                 envIdentifier,
                 envManager.sourcingInformation.condaFolder,
+                condaShPath,
             );
             return shellMaps;
         }
@@ -580,6 +586,7 @@ async function windowsExceptionGenerateConfig(
     sourceInitPath: string,
     prefix: string,
     condaFolder: string,
+    condaShPath?: string,
 ): Promise<ShellCommandMaps> {
     const shellActivation: Map<string, PythonCommandRunConfiguration[]> = new Map();
     const shellDeactivation: Map<string, PythonCommandRunConfiguration[]> = new Map();
@@ -593,7 +600,10 @@ async function windowsExceptionGenerateConfig(
     const pwshActivate = [{ executable: activation }, { executable: 'conda', args: ['activate', quotedPrefix] }];
     const cmdActivate = [{ executable: sourceInitPath }, { executable: 'conda', args: ['activate', quotedPrefix] }];
 
-    const bashActivate = [{ executable: 'source', args: [sourceInitPath.replace(/\\/g, '/'), quotedPrefix] }];
+    // Use conda.sh for bash-based shells (Git Bash) instead of activate.bat
+    // conda.sh is the proper initialization script for bash shells
+    const bashSourcePath = condaShPath ?? sourceInitPath;
+    const bashActivate = [{ executable: 'source', args: [bashSourcePath.replace(/\\/g, '/'), quotedPrefix] }];
     traceVerbose(
         `Windows activation commands: 
         PowerShell: ${JSON.stringify(pwshActivate)},