Implement executeCommand for rstudioapi as OpenRPC contract

extensions/positron-r/package.json

@@ -527,7 +527,7 @@
   },
   "positron": {
     "binaryDependencies": {
-      "ark": "0.1.60"
+      "ark": "0.1.61"
     }
   }
 }

positron/comms/ui-frontend-openrpc.json

@@ -117,6 +117,21 @@
 			],
 			"result": {}
 		},
+		{
+			"name": "execute_command",
+			"summary": "Execute a Positron command",
+			"description": "Use this to execute a Positron command from the backend (like from a runtime)",
+			"params": [
+				{
+					"name": "command",
+					"description": "The command to execute",
+					"schema": {
+						"type": "string"
+					}
+				}
+			],
+			"result": {}
+		},
 		{
 			"name": "last_active_editor_context",
 			"summary": "Context metadata for the last editor",

src/positron-dts/positron.d.ts

@@ -1117,5 +1117,13 @@ declare module 'positron' {
 		 * Returns a `EditorContext` for the last active editor.
 		 */
 		export function lastActiveEditorContext(): Thenable<EditorContext | null>;
+
+		/**
+		 * Executes a Positron command.
+		 *
+		 * @param command The Positron command name.
+		 */
+		export function executeCommand(commandId: string): Thenable<null>;
+
 	}
 }

src/vs/workbench/api/browser/positron/mainThreadLanguageRuntime.ts

@@ -14,6 +14,7 @@ import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IPositronConsoleService } from 'vs/workbench/services/positronConsole/browser/interfaces/positronConsoleService';
 import { IPositronVariablesService } from 'vs/workbench/services/positronVariables/common/interfaces/positronVariablesService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IRuntimeClientInstance, RuntimeClientState, RuntimeClientType } from 'vs/workbench/services/languageRuntime/common/languageRuntimeClientInstance';
 import { DeferredPromise } from 'vs/base/common/async';
@@ -24,7 +25,7 @@ import { IPositronHelpService } from 'vs/workbench/contrib/positronHelp/browser/
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { IRuntimeClientEvent } from 'vs/workbench/services/languageRuntime/common/languageRuntimeUiClient';
 import { URI } from 'vs/base/common/uri';
-import { BusyEvent, UiFrontendEvent, OpenEditorEvent, PromptStateEvent, WorkingDirectoryEvent } from 'vs/workbench/services/languageRuntime/common/positronUiComm';
+import { BusyEvent, UiFrontendEvent, OpenEditorEvent, PromptStateEvent, WorkingDirectoryEvent, ShowMessageEvent } from 'vs/workbench/services/languageRuntime/common/positronUiComm';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
 import { IPositronDataExplorerService } from 'vs/workbench/services/positronDataExplorer/browser/interfaces/positronDataExplorerService';
@@ -105,6 +106,7 @@ class ExtHostLanguageRuntimeAdapter implements ILanguageRuntime {
 		readonly metadata: ILanguageRuntimeMetadata,
 		readonly dynState: ILanguageRuntimeDynState,
 		private readonly _languageRuntimeService: ILanguageRuntimeService,
+		private readonly _notificationService: INotificationService,
 		private readonly _logService: ILogService,
 		private readonly _notebookService: INotebookService,
 		private readonly _editorService: IEditorService,
@@ -180,6 +182,10 @@ class ExtHostLanguageRuntimeAdapter implements ILanguageRuntime {
 				// Update current working directory
 				const dir = ev.data as WorkingDirectoryEvent;
 				this.dynState.currentWorkingDirectory = dir.directory;
+			} else if (ev.name === UiFrontendEvent.ShowMessage) {
+				// Show a message
+				const msg = ev.data as ShowMessageEvent;
+				this._notificationService.info(msg.message);
 			}
 
 			// Propagate event
@@ -950,6 +956,7 @@ export class MainThreadLanguageRuntime implements MainThreadLanguageRuntimeShape
 		@IPositronHelpService private readonly _positronHelpService: IPositronHelpService,
 		@IPositronPlotsService private readonly _positronPlotService: IPositronPlotsService,
 		@IPositronIPyWidgetsService private readonly _positronIPyWidgetsService: IPositronIPyWidgetsService,
+		@INotificationService private readonly _notificationService: INotificationService,
 		@ILogService private readonly _logService: ILogService,
 		@INotebookService private readonly _notebookService: INotebookService,
 		@IEditorService private readonly _editorService: IEditorService,
@@ -995,6 +1002,7 @@ export class MainThreadLanguageRuntime implements MainThreadLanguageRuntimeShape
 			metadata,
 			dynState,
 			this._languageRuntimeService,
+			this._notificationService,
 			this._logService,
 			this._notebookService,
 			this._editorService,

src/vs/workbench/api/common/positron/extHost.positron.api.impl.ts

@@ -25,6 +25,7 @@ import { ExtHostConsoleService } from 'vs/workbench/api/common/positron/extHostC
 import { ExtHostMethods } from './extHostMethods';
 import { ExtHostEditors } from '../extHostTextEditors';
 import { UiFrontendRequest } from 'vs/workbench/services/languageRuntime/common/positronUiComm';
+import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
 
 /**
  * Factory interface for creating an instance of the Positron API.
@@ -57,12 +58,13 @@ export function createPositronApiFactoryAndRegisterActors(accessor: ServicesAcce
 	const extHostLanguageFeatures: ExtHostLanguageFeatures =
 		rpcProtocol.getRaw(ExtHostContext.ExtHostLanguageFeatures);
 	const extHostEditors: ExtHostEditors = rpcProtocol.getRaw(ExtHostContext.ExtHostEditors);
+	const extHostCommands: ExtHostCommands = rpcProtocol.getRaw(ExtHostContext.ExtHostCommands);
 
 	const extHostLanguageRuntime = rpcProtocol.set(ExtHostPositronContext.ExtHostLanguageRuntime, new ExtHostLanguageRuntime(rpcProtocol));
 	const extHostPreviewPanels = rpcProtocol.set(ExtHostPositronContext.ExtHostPreviewPanel, new ExtHostPreviewPanels(rpcProtocol, extHostWebviews, extHostWorkspace));
 	const extHostModalDialogs = rpcProtocol.set(ExtHostPositronContext.ExtHostModalDialogs, new ExtHostModalDialogs(rpcProtocol));
 	const extHostConsoleService = rpcProtocol.set(ExtHostPositronContext.ExtHostConsoleService, new ExtHostConsoleService(rpcProtocol, extHostLogService));
-	const extHostMethods = rpcProtocol.set(ExtHostPositronContext.ExtHostMethods, new ExtHostMethods(rpcProtocol, extHostEditors));
+	const extHostMethods = rpcProtocol.set(ExtHostPositronContext.ExtHostMethods, new ExtHostMethods(rpcProtocol, extHostEditors, extHostCommands));
 
 	return function (extension: IExtensionDescription, extensionInfo: IExtensionRegistries, configProvider: ExtHostConfigProvider): typeof positron {
 
@@ -145,6 +147,9 @@ export function createPositronApiFactoryAndRegisterActors(accessor: ServicesAcce
 			lastActiveEditorContext(): Thenable<positron.EditorContext | null> {
 				return extHostMethods.lastActiveEditorContext();
 			},
+			executeCommand(commandId: string): Thenable<null> {
+				return extHostMethods.executeCommand(commandId);
+			},
 		};
 
 		// --- End Positron ---

src/vs/workbench/api/common/positron/extHost.positron.protocol.ts

@@ -67,6 +67,7 @@ export interface MainThreadMethodsShape { }
 
 export interface ExtHostMethodsShape {
 	lastActiveEditorContext(): Promise<IEditorContext | null>;
+	executeCommand(commandId: string): Promise<null>;
 }
 
 /**

src/vs/workbench/api/common/positron/extHostMethods.ts

@@ -4,6 +4,7 @@
 
 import * as extHostProtocol from './extHost.positron.protocol';
 import { ExtHostEditors } from '../extHostTextEditors';
+import { ExtHostCommands } from '../extHostCommands';
 import { UiFrontendRequest, EditorContext } from 'vs/workbench/services/languageRuntime/common/positronUiComm';
 import { JsonRpcErrorCode } from 'vs/workbench/services/languageRuntime/common/positronBaseComm';
 import { EndOfLine } from '../extHostTypeConverters';
@@ -32,6 +33,7 @@ export class ExtHostMethods implements extHostProtocol.ExtHostMethodsShape {
 	constructor(
 		_mainContext: extHostProtocol.IMainPositronContext,
 		private readonly editors: ExtHostEditors,
+		private readonly commands: ExtHostCommands
 	) {
 	}
 
@@ -67,6 +69,13 @@ export class ExtHostMethods implements extHostProtocol.ExtHostMethodsShape {
 					result = await this.debugSleep(params.ms as number);
 					break;
 				}
+				case UiFrontendRequest.ExecuteCommand: {
+					if (!params || !Object.keys(params).includes('command')) {
+						return newInvalidParamsError(method);
+					}
+					result = await this.executeCommand(params.command as string);
+					break;
+				}
 			}
 
 			return <JsonRpcResult>({ result });
@@ -144,6 +153,11 @@ export class ExtHostMethods implements extHostProtocol.ExtHostMethodsShape {
 		};
 	}
 
+	async executeCommand(commandId: string): Promise<null> {
+		await this.commands.executeCommand(commandId);
+		return null;
+	}
+
 	async debugSleep(ms: number): Promise<null> {
 		await delay(ms);
 		return null;

src/vs/workbench/services/languageRuntime/common/positronUiComm.ts

@@ -227,6 +227,20 @@ export interface DebugSleepRequest {
 
 }
 
+/**
+ * Request: Execute a Positron command
+ *
+ * Use this to execute a Positron command from the backend (like from a
+ * runtime)
+ */
+export interface ExecuteCommandRequest {
+	/**
+	 * The command to execute
+	 */
+	command: string;
+
+}
+
 /**
  * Request: Context metadata for the last editor
  *
@@ -247,6 +261,7 @@ export enum UiFrontendEvent {
 
 export enum UiFrontendRequest {
 	DebugSleep = 'debug_sleep',
+	ExecuteCommand = 'execute_command',
 	LastActiveEditorContext = 'last_active_editor_context'
 }