fix comments p2

Author: eleanorjboyd

src/features/copilotTools.ts

@@ -9,11 +9,8 @@ import {
     Uri,
 } from 'vscode';
 import {
-    EnvironmentManager,
-    PythonCommandRunConfiguration,
     PythonEnvironment,
     PythonEnvironmentExecutionInfo,
-    PythonEnvironmentManagementApi,
     PythonPackageGetterApi,
     PythonPackageManagementApi,
     PythonProjectEnvironmentApi,
@@ -79,8 +76,9 @@ export class GetEnvironmentInfoTool implements LanguageModelTool<IResourceRefere
             }
 
             const execInfo: PythonEnvironmentExecutionInfo = environment.execInfo;
-            const run: PythonCommandRunConfiguration = execInfo.run;
-            envInfo.runCommand = run.executable + (run.args && run.args.length > 0 ? ` ${run.args.join(' ')}` : '');
+            const executable = execInfo?.activatedRun?.executable ?? execInfo?.run.executable ?? 'python';
+            const args = execInfo?.activatedRun?.args ?? execInfo?.run.args ?? [];
+            envInfo.runCommand = args.length > 0 ? `${executable} ${args.join(' ')}` : executable;
             envInfo.version = environment.version;
 
             // get the environment type or manager if type is not available
@@ -210,8 +208,6 @@ export class InstallPackageTool implements LanguageModelTool<IInstallPackageInpu
             await this.api.installPackages(environment, parameters.packageList);
             const resultMessage = `Successfully installed ${packagePlurality}: ${parameters.packageList.join(', ')}`;
 
-
-
             deferredReturn.resolve({
                 content: [new LanguageModelTextPart(resultMessage)],
             });

src/test/copilotTools.unit.test.ts

@@ -18,6 +18,7 @@ import {
     InstallPackageTool,
     IResourceReference,
 } from '../features/copilotTools';
+import { EnvironmentManagers, InternalEnvironmentManager } from '../internal.api';
 
 suite('InstallPackageTool Tests', () => {
     let installPackageTool: InstallPackageTool;
@@ -249,6 +250,8 @@ suite('GetEnvironmentInfoTool Tests', () => {
     let getEnvironmentInfoTool: GetEnvironmentInfoTool;
     let mockApi: typeMoq.IMock<PythonProjectEnvironmentApi & PythonPackageGetterApi & PythonPackageManagementApi>;
     let mockEnvironment: typeMoq.IMock<PythonEnvironment>;
+    let em: typeMoq.IMock<EnvironmentManagers>;
+    let manager: typeMoq.IMock<InternalEnvironmentManager>;
 
     setup(() => {
         // Create mock functions
@@ -261,7 +264,16 @@ suite('GetEnvironmentInfoTool Tests', () => {
         mockEnvironment.setup((x: any) => x.then).returns(() => undefined);
 
         // Create an instance of GetEnvironmentInfoTool with the mock functions
-        getEnvironmentInfoTool = new GetEnvironmentInfoTool(mockApi.object);
+        manager = typeMoq.Mock.ofType<InternalEnvironmentManager>();
+        manager.setup((m) => m.id).returns(() => 'ms-python.python:venv');
+        manager.setup((m) => m.name).returns(() => 'venv');
+        manager.setup((m) => m.displayName).returns(() => 'Test Manager');
+
+        em = typeMoq.Mock.ofType<EnvironmentManagers>();
+        em.setup((e) => e.managers).returns(() => [manager.object]);
+        em.setup((e) => e.getEnvironmentManager(typeMoq.It.isAnyString())).returns(() => manager.object);
+
+        getEnvironmentInfoTool = new GetEnvironmentInfoTool(mockApi.object, em.object);
 
         // runConfig valid / not valid
         // const runConfigValid: PythonCommandRunConfiguration = {
@@ -390,7 +402,8 @@ suite('GetEnvironmentInfoTool Tests', () => {
         mockEnvironmentSuccess.setup((x: any) => x.then).returns(() => undefined);
         mockEnvironmentSuccess.setup((x) => x.version).returns(() => '3.12.1');
         const mockEnvId = typeMoq.Mock.ofType<PythonEnvironmentId>();
-        mockEnvId.setup((x) => x.managerId).returns(() => 'ms-python.python:sys');
+        mockEnvId.setup((x) => x.managerId).returns(() => 'ms-python.python:system');
+        manager.setup((m) => m.name).returns(() => 'system');
         mockEnvironmentSuccess.setup((x) => x.envId).returns(() => mockEnvId.object);
         mockEnvironmentSuccess
             .setup((x) => x.execInfo)