Add suppressProgress option to merge progress notifications

- Added suppressProgress option to PackageManagementOptions type
- Updated PipPackageManager to respect suppressProgress flag
- Updated CondaPackageManager to respect suppressProgress flag
- Modified createWithProgress to update progress message when installing packages
- Set suppressProgress:true when calling managePackages during env creation

Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com>

Author: Copilot

src/api.ts

@@ -739,6 +739,13 @@ export type PackageManagementOptions =
            * Show option to skip package installation or uninstallation.
            */
           showSkipOption?: boolean;
+
+          /**
+           * Suppress showing a progress notification when managing packages.
+           * Used when package management is part of a larger operation with its own progress notification.
+           */
+          suppressProgress?: boolean;
+
           /**
            * The list of packages to install.
            */
@@ -759,6 +766,13 @@ export type PackageManagementOptions =
            * Show option to skip package installation or uninstallation.
            */
           showSkipOption?: boolean;
+
+          /**
+           * Suppress showing a progress notification when managing packages.
+           * Used when package management is part of a larger operation with its own progress notification.
+           */
+          suppressProgress?: boolean;
+
           /**
            * The list of packages to install.
            */

src/managers/builtin/pipManager.ts

@@ -1,9 +1,11 @@
 import {
     CancellationError,
+    CancellationToken,
     Event,
     EventEmitter,
     LogOutputChannel,
     MarkdownString,
+    Progress,
     ProgressLocation,
     ThemeIcon,
     window,
@@ -77,34 +79,45 @@ export class PipPackageManager implements PackageManager, Disposable {
             install: toInstall,
             uninstall: toUninstall,
         };
-        await window.withProgress(
-            {
-                location: ProgressLocation.Notification,
-                title: 'Installing packages',
-                cancellable: true,
-            },
-            async (_progress, token) => {
-                try {
-                    const before = this.packages.get(environment.envId.id) ?? [];
-                    const after = await managePackages(environment, manageOptions, this.api, this, token);
-                    const changes = getChanges(before, after);
-                    this.packages.set(environment.envId.id, after);
-                    this._onDidChangePackages.fire({ environment, manager: this, changes });
-                } catch (e) {
-                    if (e instanceof CancellationError) {
-                        throw e;
-                    }
-                    this.log.error('Error managing packages', e);
-                    setImmediate(async () => {
-                        const result = await window.showErrorMessage('Error managing packages', 'View Output');
-                        if (result === 'View Output') {
-                            this.log.show();
-                        }
-                    });
+
+        const executeManage = async (
+            _progress: Progress<{ message?: string; increment?: number }> | undefined,
+            token: CancellationToken | undefined,
+        ) => {
+            try {
+                const before = this.packages.get(environment.envId.id) ?? [];
+                const after = await managePackages(environment, manageOptions, this.api, this, token);
+                const changes = getChanges(before, after);
+                this.packages.set(environment.envId.id, after);
+                this._onDidChangePackages.fire({ environment, manager: this, changes });
+            } catch (e) {
+                if (e instanceof CancellationError) {
                     throw e;
                 }
-            },
-        );
+                this.log.error('Error managing packages', e);
+                setImmediate(async () => {
+                    const result = await window.showErrorMessage('Error managing packages', 'View Output');
+                    if (result === 'View Output') {
+                        this.log.show();
+                    }
+                });
+                throw e;
+            }
+        };
+
+        if (options.suppressProgress) {
+            // When suppressProgress is true, execute without showing a separate progress notification
+            await executeManage(undefined, undefined);
+        } else {
+            await window.withProgress(
+                {
+                    location: ProgressLocation.Notification,
+                    title: 'Installing packages',
+                    cancellable: true,
+                },
+                executeManage,
+            );
+        }
     }
 
     async refresh(environment: PythonEnvironment): Promise<void> {

src/managers/builtin/venvUtils.ts

@@ -287,7 +287,7 @@ export async function createWithProgress(
                 basePython.version,
             ),
         },
-        async () => {
+        async (progress) => {
             const result: CreateEnvironmentResult = {};
             try {
                 const useUv = await isUvInstalled(log);
@@ -319,10 +319,13 @@ export async function createWithProgress(
                 // install packages
                 if (packages && (packages.install.length > 0 || packages.uninstall.length > 0)) {
                     try {
+                        // Update progress message to indicate package installation
+                        progress.report({ message: l10n.t('Installing packages...') });
                         await api.managePackages(env, {
                             upgrade: false,
                             install: packages?.install,
                             uninstall: packages?.uninstall ?? [],
+                            suppressProgress: true,
                         });
                     } catch (e) {
                         // error occurred while installing packages

src/managers/conda/condaPackageManager.ts

@@ -1,10 +1,13 @@
 import {
     CancellationError,
+    CancellationToken,
+    CancellationTokenSource,
     Disposable,
     Event,
     EventEmitter,
     LogOutputChannel,
     MarkdownString,
+    Progress,
     ProgressLocation,
 } from 'vscode';
 import {
@@ -70,31 +73,48 @@ export class CondaPackageManager implements PackageManager, Disposable {
             install: toInstall,
             uninstall: toUninstall,
         };
-        await withProgress(
-            {
-                location: ProgressLocation.Notification,
-                title: CondaStrings.condaInstallingPackages,
-                cancellable: true,
-            },
-            async (_progress, token) => {
-                try {
-                    const before = this.packages.get(environment.envId.id) ?? [];
-                    const after = await managePackages(environment, manageOptions, this.api, this, token, this.log);
-                    const changes = getChanges(before, after);
-                    this.packages.set(environment.envId.id, after);
-                    this._onDidChangePackages.fire({ environment: environment, manager: this, changes });
-                } catch (e) {
-                    if (e instanceof CancellationError) {
-                        throw e;
-                    }
 
-                    this.log.error('Error installing packages', e);
-                    setImmediate(async () => {
-                        await showErrorMessageWithLogs(CondaStrings.condaInstallError, this.log);
-                    });
+        const executeManage = async (
+            _progress: Progress<{ message?: string; increment?: number }> | undefined,
+            token: CancellationToken,
+        ) => {
+            try {
+                const before = this.packages.get(environment.envId.id) ?? [];
+                const after = await managePackages(environment, manageOptions, this.api, this, token, this.log);
+                const changes = getChanges(before, after);
+                this.packages.set(environment.envId.id, after);
+                this._onDidChangePackages.fire({ environment: environment, manager: this, changes });
+            } catch (e) {
+                if (e instanceof CancellationError) {
+                    throw e;
                 }
-            },
-        );
+
+                this.log.error('Error installing packages', e);
+                setImmediate(async () => {
+                    await showErrorMessageWithLogs(CondaStrings.condaInstallError, this.log);
+                });
+            }
+        };
+
+        if (options.suppressProgress) {
+            // When suppressProgress is true, execute without showing a separate progress notification
+            // Create a cancellation token source since conda's managePackages requires one
+            const tokenSource = new CancellationTokenSource();
+            try {
+                await executeManage(undefined, tokenSource.token);
+            } finally {
+                tokenSource.dispose();
+            }
+        } else {
+            await withProgress(
+                {
+                    location: ProgressLocation.Notification,
+                    title: CondaStrings.condaInstallingPackages,
+                    cancellable: true,
+                },
+                executeManage,
+            );
+        }
     }
 
     async refresh(environment: PythonEnvironment): Promise<void> {