Use wrapper commands for menu actions and simplify context keys

- Add UpdateSelectedPackageAction and UninstallSelectedPackageAction
  wrapper commands that pass the selected package to the main commands
  when invoked from the ViewTitle menu
- Keep main Update/Uninstall commands for command palette (always show
  quick pick)
- Simplify selectedPackage from boolean context key + property to a
  single string context key
- Add PACKAGES_CAN_RUN_ACTION precondition to Update/Uninstall commands

See #12922

Author: bricestacey

src/vs/workbench/contrib/positronPackages/browser/positronPackages.contribution.ts

@@ -300,13 +300,7 @@ class UninstallPackageAction extends Action2 {
 			title: nls.localize2('uninstallPackage', 'Uninstall Package'),
 			category: PACKAGES_CATEGORY,
 			f1: true,
-			precondition: POSITRON_PACKAGES_ENABLED,
-			menu: {
-				id: MenuId.ViewTitle,
-				when: ContextKeyExpr.and(PACKAGES_VIEW_VISIBLE, PACKAGES_HAS_SELECTION),
-				group: 'packages',
-				order: 4
-			}
+			precondition: ContextKeyExpr.and(POSITRON_PACKAGES_ENABLED, PACKAGES_CAN_RUN_ACTION),
 		});
 	}
 	override async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
@@ -377,13 +371,7 @@ class UpdatePackageAction extends Action2 {
 			title: nls.localize2('updatePackage', 'Update Package'),
 			category: PACKAGES_CATEGORY,
 			f1: true,
-			precondition: POSITRON_PACKAGES_ENABLED,
-			menu: {
-				id: MenuId.ViewTitle,
-				when: ContextKeyExpr.and(PACKAGES_VIEW_VISIBLE, PACKAGES_HAS_SELECTION),
-				group: 'packages',
-				order: 3
-			}
+			precondition: ContextKeyExpr.and(POSITRON_PACKAGES_ENABLED, PACKAGES_CAN_RUN_ACTION),
 		});
 	}
 	override async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
@@ -494,9 +482,65 @@ class UpdateAllPackagesAction extends Action2 {
 	}
 }
 
+/**
+ * Menu wrapper for Update Package that passes the selected package to the main command.
+ */
+class UpdateSelectedPackageAction extends Action2 {
+	constructor() {
+		super({
+			id: 'positronPackages.updateSelectedPackage',
+			title: nls.localize2('updatePackage', 'Update Package'),
+			category: PACKAGES_CATEGORY,
+			precondition: ContextKeyExpr.and(POSITRON_PACKAGES_ENABLED, PACKAGES_CAN_RUN_ACTION),
+			menu: {
+				id: MenuId.ViewTitle,
+				when: ContextKeyExpr.and(PACKAGES_VIEW_VISIBLE, PACKAGES_HAS_SELECTION),
+				group: 'packages',
+				order: 3
+			}
+		});
+	}
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const service = accessor.get(IPositronPackagesService);
+		const commandService = accessor.get(ICommandService);
+		if (service.selectedPackage) {
+			await commandService.executeCommand(PACKAGES_UPDATE_COMMAND_ID, service.selectedPackage);
+		}
+	}
+}
+
+/**
+ * Menu wrapper for Uninstall Package that passes the selected package to the main command.
+ */
+class UninstallSelectedPackageAction extends Action2 {
+	constructor() {
+		super({
+			id: 'positronPackages.uninstallSelectedPackage',
+			title: nls.localize2('uninstallPackage', 'Uninstall Package'),
+			category: PACKAGES_CATEGORY,
+			precondition: ContextKeyExpr.and(POSITRON_PACKAGES_ENABLED, PACKAGES_CAN_RUN_ACTION),
+			menu: {
+				id: MenuId.ViewTitle,
+				when: ContextKeyExpr.and(PACKAGES_VIEW_VISIBLE, PACKAGES_HAS_SELECTION),
+				group: 'packages',
+				order: 4
+			}
+		});
+	}
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const service = accessor.get(IPositronPackagesService);
+		const commandService = accessor.get(ICommandService);
+		if (service.selectedPackage) {
+			await commandService.executeCommand(PACKAGES_UNINSTALL_COMMAND_ID, service.selectedPackage);
+		}
+	}
+}
+
 registerAction2(InstallPackageAction);
 registerAction2(RefreshPackagesAction);
 registerAction2(UninstallPackageAction);
 registerAction2(UpdatePackageAction);
 registerAction2(UpdateAllPackagesAction);
+registerAction2(UpdateSelectedPackageAction);
+registerAction2(UninstallSelectedPackageAction);
 registerSingleton(IPositronPackagesService, PositronPackagesService, InstantiationType.Delayed);

src/vs/workbench/contrib/positronPackages/browser/positronPackagesContextKeys.ts

@@ -11,7 +11,7 @@ export const POSITRON_PACKAGES_VIEW_ID = 'workbench.view.positronPackages.view';
 // Context keys for the packages view
 export const POSITRON_PACKAGES_HAS_ACTIVE_SESSION = new RawContextKey<boolean>('positronPackages.hasActiveSession', false);
 export const POSITRON_PACKAGES_IS_BUSY = new RawContextKey<boolean>('positronPackages.isBusy', false);
-export const POSITRON_PACKAGES_HAS_SELECTED_PACKAGE = new RawContextKey<boolean>('positronPackages.hasSelectedPackage', false);
+export const POSITRON_PACKAGES_SELECTED_PACKAGE = new RawContextKey<string>('positronPackages.selectedPackage', '');
 
 // Context key expressions for menu enablement
 export const PACKAGES_VIEW_VISIBLE = ContextKeyExpr.equals('view', POSITRON_PACKAGES_VIEW_ID);
@@ -21,5 +21,5 @@ export const PACKAGES_CAN_RUN_ACTION = ContextKeyExpr.and(
 );
 export const PACKAGES_HAS_SELECTION = ContextKeyExpr.and(
 	PACKAGES_CAN_RUN_ACTION,
-	POSITRON_PACKAGES_HAS_SELECTED_PACKAGE
+	POSITRON_PACKAGES_SELECTED_PACKAGE.notEqualsTo('')
 );

src/vs/workbench/contrib/positronPackages/browser/positronPackagesService.ts

@@ -12,7 +12,7 @@ import { ILogService } from '../../../../platform/log/common/log.js';
 import { LanguageRuntimeSessionMode } from '../../../services/languageRuntime/common/languageRuntimeService.js';
 import { ILanguageRuntimePackage, ILanguageRuntimeSession, IPackageSpec, IRuntimeSessionService } from '../../../services/runtimeSession/common/runtimeSessionService.js';
 import { IPositronPackagesService } from './interfaces/positronPackagesService.js';
-import { POSITRON_PACKAGES_HAS_ACTIVE_SESSION, POSITRON_PACKAGES_HAS_SELECTED_PACKAGE, POSITRON_PACKAGES_IS_BUSY } from './positronPackagesContextKeys.js';
+import { POSITRON_PACKAGES_HAS_ACTIVE_SESSION, POSITRON_PACKAGES_IS_BUSY, POSITRON_PACKAGES_SELECTED_PACKAGE } from './positronPackagesContextKeys.js';
 import { IPositronPackagesInstance, PositronPackagesInstance } from './positronPackagesInstance.js';
 
 const TIMEOUT_REFRESH_MS = 5_000; // 5 seconds
@@ -34,10 +34,7 @@ export class PositronPackagesService extends Disposable implements IPositronPack
 	// Context keys
 	private readonly _hasActiveSessionContextKey: IContextKey<boolean>;
 	private readonly _isBusyContextKey: IContextKey<boolean>;
-	private readonly _hasSelectedPackageContextKey: IContextKey<boolean>;
-
-	// Selected package
-	private _selectedPackage: string | undefined;
+	private readonly _selectedPackageContextKey: IContextKey<string>;
 
 	// Disposables for tracking busy state of the active instance
 	private readonly _activeInstanceDisposables = this._register(new DisposableStore());
@@ -64,7 +61,7 @@ export class PositronPackagesService extends Disposable implements IPositronPack
 		// Initialize context keys
 		this._hasActiveSessionContextKey = POSITRON_PACKAGES_HAS_ACTIVE_SESSION.bindTo(this._contextKeyService);
 		this._isBusyContextKey = POSITRON_PACKAGES_IS_BUSY.bindTo(this._contextKeyService);
-		this._hasSelectedPackageContextKey = POSITRON_PACKAGES_HAS_SELECTED_PACKAGE.bindTo(this._contextKeyService);
+		this._selectedPackageContextKey = POSITRON_PACKAGES_SELECTED_PACKAGE.bindTo(this._contextKeyService);
 
 		// Create new instances
 		this._register(this._runtimeSessionService.onWillStartSession((e) => {
@@ -175,12 +172,11 @@ export class PositronPackagesService extends Disposable implements IPositronPack
 	}
 
 	get selectedPackage(): string | undefined {
-		return this._selectedPackage;
+		return this._selectedPackageContextKey.get() || undefined;
 	}
 
 	setSelectedPackage(packageName: string | undefined): void {
-		this._selectedPackage = packageName;
-		this._hasSelectedPackageContextKey.set(!!packageName);
+		this._selectedPackageContextKey.set(packageName ?? '');
 	}
 
 	async refreshPackages(token?: CancellationToken): Promise<ILanguageRuntimePackage[]> {