Add interruptPrompt() method to Jupyter kernels

extensions/jupyter-adapter/src/JupyterKernel.ts

@@ -822,6 +822,14 @@ export class JupyterKernel extends EventEmitter implements vscode.Disposable {
 		}
 	}
 
+	/**
+	 * Interrupts the kernel and resets prompt state
+	 */
+	public async interruptPrompt(id: string): Promise<void> {
+		await this.interrupt();
+		this._inputRequests.delete(id);
+	}
+
 	/**
 	 * Send a message to the kernel
 	 *

extensions/jupyter-adapter/src/LanguageRuntimeAdapter.ts

@@ -164,6 +164,16 @@ export class LanguageRuntimeAdapter
 		this._kernel.replyToPrompt(id, reply);
 	}
 
+	/**
+	 * Interrupt an input prompt from the kernel.
+	 *
+	 * @param id The ID of the prompt to which user responded
+	 */
+	public async interruptPrompt(id: string): Promise<void> {
+		this._kernel.log(`Interrupting prompt ${id}`);
+		this._kernel.interruptPrompt(id);
+	}
+
 	/**
 	 * Interrupts the kernel.
 	 */

extensions/positron-r/src/runtime.ts

@@ -76,6 +76,10 @@ export class RRuntime implements positron.LanguageRuntime, vscode.Disposable {
 		this._kernel.replyToPrompt(id, reply);
 	}
 
+	async interruptPrompt(id: string): Promise<void> {
+		await this._kernel.interruptPrompt(id);
+	}
+
 	start(): Thenable<positron.LanguageRuntimeInfo> {
 		return this._kernel.start();
 	}

src/positron-dts/positron.d.ts

@@ -442,6 +442,9 @@ declare module 'positron' {
 		/** Reply to a prompt issued by the runtime */
 		replyToPrompt(id: string, reply: string): void;
 
+		/** Interrupt a prompt issued by the runtime */
+		interruptPrompt(id: string): Promise<void>;
+
 		/**
 		 * Start the runtime; returns a Thenable that resolves with information about the runtime.
 		 * If the runtime fails to start for any reason, the Thenable should reject with an error

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

@@ -333,6 +333,10 @@ class ExtHostLanguageRuntimeAdapter implements ILanguageRuntime {
 		this._proxy.$replyToPrompt(this.handle, id, value);
 	}
 
+	async interruptPrompt(id: string): Promise<void> {
+		await this._proxy.$interruptPrompt(this.handle, id);
+	}
+
 	async interrupt(): Promise<void> {
 		this._stateEmitter.fire(RuntimeState.Interrupting);
 		return this._proxy.$interruptLanguageRuntime(this.handle);

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

@@ -26,6 +26,7 @@ export interface ExtHostLanguageRuntimeShape {
 	$removeClient(handle: number, id: string): void;
 	$sendClientMessage(handle: number, client_id: string, message_id: string, message: any): void;
 	$replyToPrompt(handle: number, id: string, response: string): void;
+	$interruptPrompt(handle: number, id: string): Promise<void>;
 	$interruptLanguageRuntime(handle: number): Promise<void>;
 	$restartLanguageRuntime(handle: number): Promise<void>;
 	$shutdownLanguageRuntime(handle: number): Promise<void>;

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

@@ -116,6 +116,13 @@ export class ExtHostLanguageRuntime implements extHostProtocol.ExtHostLanguageRu
 		this._runtimes[handle].replyToPrompt(id, response);
 	}
 
+	async $interruptPrompt(handle: number, id: string): Promise<void> {
+		if (handle >= this._runtimes.length) {
+			throw new Error(`Cannot interrupt prompt: language runtime handle '${handle}' not found or no longer valid.`);
+		}
+		this._runtimes[handle].interruptPrompt(id);
+	}
+
 	public registerClientHandler(handler: positron.RuntimeClientHandler): IDisposable {
 		this._clientHandlers.push(handler);
 		return new Disposable(() => {

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

@@ -412,6 +412,9 @@ export interface ILanguageRuntime {
 	 */
 	replyToPrompt(id: string, value: string): void;
 
+	/** Interrupt an input prompt issued by the runtime */
+	interruptPrompt(id: string): Promise<void>;
+
 	start(): Thenable<ILanguageRuntimeInfo>;
 
 	/** Interrupt the runtime */
@@ -490,4 +493,3 @@ export interface ILanguageRuntimeService {
 	startRuntime(runtimeId: string): void;
 }
 export { RuntimeClientType, IRuntimeClientInstance };
-

src/vs/workbench/services/positronConsole/common/positronConsoleService.ts

@@ -608,7 +608,7 @@ class PositronConsoleInstance extends Disposable implements IPositronConsoleInst
 	interruptPrompt(id: string) {
 		if (this._promptActive) {
 			this._promptActive = false;
-			this._runtime.interrupt();
+			this._runtime.interruptPrompt(id);
 		}
 	}