fix: shell type API

Author: karthiknadig

src/extension.ts

@@ -56,7 +56,7 @@ import { AutoFindProjects } from './features/creators/autoFindProjects';
 import { registerTools } from './common/lm.apis';
 import { GetPackagesTool } from './features/copilotTools';
 import { TerminalActivationImpl } from './features/terminal/terminalActivationState';
-import { getEnvironmentForTerminal } from './features/terminal/utils';
+import { getEnvironmentForTerminal, normalizeShellPath } from './features/terminal/utils';
 import { PowershellStartupProvider } from './features/terminal/startup/powershellStartup';
 import { ShellStartupActivationManagerImpl } from './features/terminal/startup/activateUsingShellStartup';
 import { BashStartupProvider, GitBashStartupProvider } from './features/terminal/startup/bashStartup';
@@ -251,7 +251,8 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
             const envVar = shellEnv.value;
             if (envVar) {
                 if (envVar['VIRTUAL_ENV']) {
-                    const env = await api.resolveEnvironment(Uri.file(envVar['VIRTUAL_ENV']));
+                    const envPath = normalizeShellPath(envVar['VIRTUAL_ENV'], e.terminal.state.shell);
+                    const env = await api.resolveEnvironment(Uri.file(envPath));
                     if (env) {
                         monitoredTerminals.set(e.terminal, env);
                         terminalActivation.updateActivationState(e.terminal, env, true);

src/features/terminal/startup/bashStartup.ts

@@ -52,8 +52,8 @@ async function getZshProfiles(): Promise<string[]> {
     return result.map((p) => p.profilePath);
 }
 
-const regionStart = '# vscode python environment activation begin';
-const regionEnd = '# vscode python environment activation end';
+const regionStart = '# >>> vscode python';
+const regionEnd = '# <<< vscode python';
 
 function getActivationContent(): string {
     const lineSep = '\n';

src/features/terminal/utils.ts

@@ -3,6 +3,7 @@ import { Terminal, TerminalOptions, Uri } from 'vscode';
 import { sleep } from '../../common/utils/asyncUtils';
 import { PythonEnvironment, PythonProject, PythonProjectEnvironmentApi, PythonProjectGetterApi } from '../../api';
 import { getConfiguration, getWorkspaceFolders } from '../../common/workspace.apis';
+import { isWindows } from '../../common/utils/platformUtils';
 
 const SHELL_INTEGRATION_TIMEOUT = 500; // 0.5 seconds
 const SHELL_INTEGRATION_POLL_INTERVAL = 20; // 0.02 seconds
@@ -125,3 +126,12 @@ export async function getAllDistinctProjectEnvironments(
 
     return envs.length > 0 ? envs : undefined;
 }
+
+export function normalizeShellPath(filePath: string, shellType?: string): string {
+    if (isWindows() && shellType) {
+        if (shellType.toLowerCase() === 'gitbash' || shellType.toLowerCase() === 'git-bash') {
+            return filePath.replace(/\\/g, '/').replace(/^\/([a-zA-Z])/, '$1:');
+        }
+    }
+    return filePath;
+}