fix actions from kernel menu

Author: seeM

src/vs/workbench/contrib/positronNotebook/browser/KernelStatusBadge.tsx

@@ -18,6 +18,7 @@ import { localize } from '../../../../nls.js';
 import { MenuId, MenuItemAction, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { ActionBarMenuButton } from '../../../../platform/positronActionBar/browser/components/actionBarMenuButton.js';
 import { useMenu } from './useMenu.js';
+import { IPositronNotebookActionBarContext } from '../../runtimeNotebookKernel/browser/runtimeNotebookKernelActions.js';
 
 const kernelStatusToRuntimeStatus = {
 	[KernelStatus.Uninitialized]: RuntimeStatus.Disconnected,
@@ -51,7 +52,10 @@ export function KernelStatusBadge() {
 		}
 		const actions: (MenuItemAction | SubmenuItemAction)[] = [];
 		for (const [_group, groupActions] of menu.current.getActions({
-			arg: notebookInstance.uri,
+			arg: {
+				uri: notebookInstance.uri,
+				ui: true,
+			} satisfies IPositronNotebookActionBarContext,
 			shouldForwardArgs: true,
 		})) {
 			actions.push(...groupActions);

src/vs/workbench/contrib/positronNotebook/browser/PositronNotebookInstance.ts

@@ -28,7 +28,7 @@ import { IPositronNotebookService } from './positronNotebookService.js';
 import { IPositronNotebookInstance, KernelStatus } from './IPositronNotebookInstance.js';
 import { NotebookCellTextModel } from '../../notebook/common/model/notebookCellTextModel.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { SELECT_KERNEL_ID_POSITRON, SelectPositronNotebookKernelContext } from './SelectPositronNotebookKernelAction.js';
+import { SELECT_KERNEL_ID_POSITRON } from './SelectPositronNotebookKernelAction.js';
 import { INotebookKernel, INotebookKernelService } from '../../notebook/common/notebookKernelService.js';
 import { IRuntimeSessionService } from '../../../services/runtimeSession/common/runtimeSessionService.js';
 import { isEqual } from '../../../../base/common/resources.js';
@@ -932,10 +932,7 @@ export class PositronNotebookInstance extends Disposable implements IPositronNot
 		if (this.kernelStatus.get() !== KernelStatus.Connected) {
 			this._logService.info(this.id, 'No kernel connected, attempting to connect');
 			// Attempt to connect to the kernel
-			await this._commandService.executeCommand(
-				SELECT_KERNEL_ID_POSITRON,
-				{ forceDropdown: false } satisfies SelectPositronNotebookKernelContext
-			);
+			await this._commandService.executeCommand(SELECT_KERNEL_ID_POSITRON);
 		}
 
 		const hasExecutions = [...cells].some(cell => Boolean(this.notebookExecutionStateService.getCellExecution(cell.uri)));

src/vs/workbench/contrib/positronNotebook/browser/SelectPositronNotebookKernelAction.ts

@@ -13,15 +13,12 @@ import { PositronNotebookInstance } from './PositronNotebookInstance.js';
 import { IPositronNotebookService } from './positronNotebookService.js';
 import { POSITRON_RUNTIME_NOTEBOOK_KERNELS_EXTENSION_ID } from '../../runtimeNotebookKernel/common/runtimeNotebookKernelConfig.js';
 import { Codicon } from '../../../../base/common/codicons.js';
+import { IPositronNotebookActionBarContext } from '../../runtimeNotebookKernel/browser/runtimeNotebookKernelActions.js';
 
 export const SELECT_KERNEL_ID_POSITRON = 'positronNotebook.selectKernel';
 const NOTEBOOK_ACTIONS_CATEGORY_POSITRON = localize2('positronNotebookActions.category', 'Positron Notebook');
 const NOTEBOOK_IS_ACTIVE_EDITOR = ContextKeyExpr.equals('activeEditor', 'workbench.editor.positronNotebook');
 
-export interface SelectPositronNotebookKernelContext {
-	forceDropdown: boolean;
-}
-
 class SelectPositronNotebookKernelAction extends Action2 {
 
 	constructor() {
@@ -39,8 +36,9 @@ class SelectPositronNotebookKernelAction extends Action2 {
 		});
 	}
 
-	async run(accessor: ServicesAccessor, context?: SelectPositronNotebookKernelContext): Promise<boolean> {
-		const { forceDropdown } = context || { forceDropdown: false };
+	async run(accessor: ServicesAccessor, context?: IPositronNotebookActionBarContext): Promise<boolean> {
+		// Force the dropdown if the action was invoked by the user in the UI
+		const forceDropdown = context?.ui ?? false;
 		const notebookKernelService = accessor.get(INotebookKernelService);
 		const notebookService = accessor.get(IPositronNotebookService);
 		const activeNotebook = notebookService.getActiveInstance();

src/vs/workbench/contrib/runtimeNotebookKernel/browser/runtimeNotebookKernelActions.ts

@@ -36,6 +36,16 @@ interface INotebookEditorToolbarContext {
 	source: 'notebookToolbar';
 }
 
+export interface IPositronNotebookActionBarContext {
+	ui: boolean;
+	uri: URI;
+}
+
+function isPositronNotebookActionBarContext(obj: unknown): obj is IPositronNotebookActionBarContext {
+	const context = obj as IPositronNotebookActionBarContext;
+	return !!context && typeof context.ui === 'boolean' && isUriComponents(context.uri);
+}
+
 /** The context for actions in a notebook using a language runtime kernel. */
 interface IRuntimeNotebookKernelActionContext {
 	/** The notebook's language runtime session, if any */
@@ -51,20 +61,20 @@ interface IRuntimeNotebookKernelActionContext {
 abstract class BaseRuntimeNotebookKernelAction extends Action2 {
 	abstract runWithContext(accessor: ServicesAccessor, context?: IRuntimeNotebookKernelActionContext): Promise<void>;
 
-	override async run(accessor: ServicesAccessor, context?: INotebookEditorToolbarContext | URI): Promise<void> {
+	override async run(accessor: ServicesAccessor, context?: INotebookEditorToolbarContext | IPositronNotebookActionBarContext): Promise<void> {
 		const editorService = accessor.get(IEditorService);
 		const runtimeSessionService = accessor.get(IRuntimeSessionService);
 
 		// Try to use the notebook URI from the context - set if run via the notebook editor toolbar.
 		let notebookUri: URI | undefined;
 		let source: IRuntimeNotebookKernelActionContext['source'];
 		if (context) {
-			if (isUriComponents(context)) {
+			if (isPositronNotebookActionBarContext(context)) {
 				source = {
 					id: 'positronNotebookActionBar',
 					debugMessage: 'User clicked restart button in Positron notebook editor toolbar',
 				};
-				notebookUri = context;
+				notebookUri = context.uri;
 			} else {
 				source = {
 					id: 'vscodeNotebookToolbar',