From 414439db03963991e8b8558119b72f8ce05d22a7 Mon Sep 17 00:00:00 2001
From: Kartik Raj <karraj@microsoft.com>
Date: Wed, 30 Aug 2023 01:06:39 +0000
Subject: [PATCH 1/3] Edit prompt

---
 .../terminalEnvVarCollectionPrompt.ts           | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/client/interpreter/activation/terminalEnvVarCollectionPrompt.ts b/src/client/interpreter/activation/terminalEnvVarCollectionPrompt.ts
index 8b7850514874..dc77081775f3 100644
--- a/src/client/interpreter/activation/terminalEnvVarCollectionPrompt.ts
+++ b/src/client/interpreter/activation/terminalEnvVarCollectionPrompt.ts
@@ -3,6 +3,7 @@
 
 import { inject, injectable } from 'inversify';
 import { Uri } from 'vscode';
+import path from 'path';
 import { IActiveResourceService, IApplicationShell, ITerminalManager } from '../../common/application/types';
 import {
     IConfigurationService,
@@ -16,6 +17,7 @@ import { IExtensionSingleActivationService } from '../../activation/types';
 import { ITerminalEnvVarCollectionService } from './types';
 import { inTerminalEnvVarExperiment } from '../../common/experiments/helpers';
 import { IInterpreterService } from '../contracts';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 
 export const terminalEnvCollectionPromptKey = 'TERMINAL_ENV_COLLECTION_PROMPT_KEY';
 
@@ -70,7 +72,7 @@ export class TerminalEnvVarCollectionPrompt implements IExtensionSingleActivatio
         }
         const prompts = [Common.doNotShowAgain];
         const interpreter = await this.interpreterService.getActiveInterpreter(resource);
-        const terminalPromptName = interpreter?.envName ? ` (${interpreter.envName})` : '';
+        const terminalPromptName = getPromptName(interpreter);
         const selection = await this.appShell.showInformationMessage(
             Interpreters.terminalEnvVarCollectionPrompt.format(terminalPromptName),
             ...prompts,
@@ -83,3 +85,16 @@ export class TerminalEnvVarCollectionPrompt implements IExtensionSingleActivatio
         }
     }
 }
+
+function getPromptName(interpreter?: PythonEnvironment) {
+    if (!interpreter) {
+        return '';
+    }
+    if (interpreter.envName) {
+        return ` "(${interpreter.envName})"`;
+    }
+    if (interpreter.envPath) {
+        return ` "(${path.basename(interpreter.envPath)})"`;
+    }
+    return '';
+}

From 5004e15c0634068f8aa83e8376541db1c5de93b9 Mon Sep 17 00:00:00 2001
From: Kartik Raj <karraj@microsoft.com>
Date: Wed, 30 Aug 2023 01:11:27 +0000
Subject: [PATCH 2/3] Fix

---
 .../activation/terminalEnvVarCollectionPrompt.unit.test.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/interpreters/activation/terminalEnvVarCollectionPrompt.unit.test.ts b/src/test/interpreters/activation/terminalEnvVarCollectionPrompt.unit.test.ts
index e1bc2d171226..7bddbdcbbfe0 100644
--- a/src/test/interpreters/activation/terminalEnvVarCollectionPrompt.unit.test.ts
+++ b/src/test/interpreters/activation/terminalEnvVarCollectionPrompt.unit.test.ts
@@ -35,7 +35,7 @@ suite('Terminal Environment Variable Collection Prompt', () => {
     let interpreterService: IInterpreterService;
     const prompts = [Common.doNotShowAgain];
     const envName = 'env';
-    const expectedMessage = Interpreters.terminalEnvVarCollectionPrompt.format(` (${envName})`);
+    const expectedMessage = Interpreters.terminalEnvVarCollectionPrompt.format(` "(${envName})"`);
 
     setup(async () => {
         shell = mock<IApplicationShell>();

From 863cd7ddb19573404623cd1273f90d3f02f21527 Mon Sep 17 00:00:00 2001
From: Kartik Raj <karraj@microsoft.com>
Date: Wed, 30 Aug 2023 01:12:12 +0000
Subject: [PATCH 3/3] Nit

---
 .../interpreter/activation/terminalEnvVarCollectionPrompt.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/interpreter/activation/terminalEnvVarCollectionPrompt.ts b/src/client/interpreter/activation/terminalEnvVarCollectionPrompt.ts
index dc77081775f3..b5d42f0e7dbe 100644
--- a/src/client/interpreter/activation/terminalEnvVarCollectionPrompt.ts
+++ b/src/client/interpreter/activation/terminalEnvVarCollectionPrompt.ts
@@ -3,7 +3,7 @@
 
 import { inject, injectable } from 'inversify';
 import { Uri } from 'vscode';
-import path from 'path';
+import * as path from 'path';
 import { IActiveResourceService, IApplicationShell, ITerminalManager } from '../../common/application/types';
 import {
     IConfigurationService,