Merge remote-tracking branch 'origin/main' into feature/console-hide-session-list

Author: samclark2015

.github/workflows/positron-python-ci.yml

@@ -5,12 +5,14 @@ on:
   push:
     branches:
       - main
+      - 'prerelease/**'
     paths:
       - '.github/workflows/positron-python-ci.yml'
       - 'extensions/positron-python/**'
   pull_request:
     branches:
       - main
+      - 'prerelease/**'
     paths:
       - '.github/workflows/positron-python-ci.yml'
       - 'extensions/positron-python/**'

build/gulpfile.vscode.js

@@ -527,10 +527,29 @@ function patchWin32DependenciesTask(cwd) {
 		const packageJson = JSON.parse(await fs.promises.readFile(path.join(cwd, 'resources', 'app', 'package.json'), 'utf8'));
 		const product = JSON.parse(await fs.promises.readFile(path.join(cwd, 'resources', 'app', 'product.json'), 'utf8'));
 		const baseVersion = packageJson.version.replace(/-.*$/, '');
+		// --- Start Positron ---
+		const year = new Date().getFullYear();
+		const executablePath = `${product.nameShort}.exe`;
+
+		fancyLog('rcedit: ' + executablePath);
+
+		await rcedit(path.join(cwd, executablePath), {
+			'file-version': product.positronVersion,
+			'version-string': {
+				'CompanyName': 'Posit Software, PBC',
+				'FileDescription': product.nameLong,
+				'FileVersion': product.positronVersion,
+				'InternalName': executablePath,
+				'LegalCopyright': `Copyright (C) 2022-${year} Posit Software, PBC. All rights reserved.`,
+				'OriginalFilename': executablePath,
+				'ProductName': product.nameLong,
+				'ProductVersion': product.positronVersion,
+			}
+		});
 
 		await Promise.all(deps.map(async dep => {
 			const basename = path.basename(dep);
-			// --- Start Positron ---
+			fancyLog('rcedit: ' + dep);
 			try {
 				await rcedit(path.join(cwd, dep), {
 					'file-version': baseVersion,

build/lib/bootstrapExtensions.js

@@ -141,14 +141,6 @@ export function getBootstrapExtensions(): Promise<void> {
 		const controlState = control[extension.name] || 'marketplace';
 		control[extension.name] = controlState;
 
-		// Discard extensions intended for the web. The 'type' field isn't a
-		// formal part of the extension definition but a custom field we use to
-		// filter out web-only extensions (i.e. Posit Workbench)
-		// @ts-ignore
-		if (extension.type === 'reh-web') {
-			continue;
-		}
-
 		streams.push(syncExtension(extension, controlState));
 	}
 

build/lib/bootstrapExtensions.ts

@@ -9,6 +9,7 @@ hvplot==0.11.2 ; python_version >= '3.9'
 hvplot==0.8.0 ; python_version < '3.9'
 ibis-framework[duckdb]==10.0.0; python_version >= '3.10'
 ipykernel==6.29.5
+ipython<=8.31.0
 ipywidgets==8.1.5
 lightning==2.3.2
 matplotlib==3.7.4; python_version < '3.9'

extensions/positron-python/python_files/posit/pinned-test-requirements.txt

@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (C) 2025 Posit Software, PBC. All rights reserved.
+ *  Copyright (C) 2024-2025 Posit Software, PBC. All rights reserved.
  *  Licensed under the Elastic License 2.0. See LICENSE.txt for license information.
  *--------------------------------------------------------------------------------------------*/
 

extensions/positron-python/src/test/positron/testElectron.ts

@@ -775,7 +775,7 @@ export class ReticulateProvider {
 		this.context.subscriptions.push(positron.runtime.registerLanguageRuntimeManager('python', this.manager));
 	}
 
-	async registerClient(client: positron.RuntimeClientInstance) {
+	async registerClient(client: positron.RuntimeClientInstance, input?: string) {
 		if (this._client) {
 			this._client.dispose();
 		}
@@ -786,15 +786,23 @@ export class ReticulateProvider {
 		await this.manager.maybeRegisterReticulateRuntime();
 		await positron.runtime.selectLanguageRuntime('reticulate');
 
+		if (input) {
+			await positron.runtime.executeCode('python', input, true, true);
+		}
+
 		this.manager._session?.onDidEndSession(() => {
 			this._client?.dispose();
 			this._client = undefined;
 		});
 
-		this._client.onDidSendEvent((e) => {
+		this._client.onDidSendEvent(async (e) => {
 			const event = e.data as any;
 			if (event.method === 'focus') {
-				this.focusReticulateConsole();
+				let input;
+				if (event.params && event.params.input) {
+					input = event.params.input;
+				}
+				await this.focusReticulateConsole(input);
 			}
 		});
 
@@ -807,12 +815,12 @@ export class ReticulateProvider {
 		);
 	}
 
-	focusReticulateConsole() {
+	async focusReticulateConsole(input?: string) {
 		// if this session is already active, this is a no-op that just
 		// brings focus.
-		positron.runtime.selectLanguageRuntime('reticulate');
-		// Execute an empty code block to focus the console
-		positron.runtime.executeCode('python', '', true, true);
+		await positron.runtime.selectLanguageRuntime('reticulate');
+		// Execute an empty code block if input is null to focus the console.
+		await positron.runtime.executeCode('python', input ?? '', true, true);
 	}
 
 	dispose() {
@@ -837,7 +845,7 @@ export function activate(context: vscode.ExtensionContext) {
 		positron.runtime.registerClientHandler({
 			clientType: 'positron.reticulate',
 			callback: (client, params: any) => {
-				reticulateProvider.registerClient(client);
+				reticulateProvider.registerClient(client, params.input);
 				return true;
 			}
 		}));

extensions/positron-reticulate/src/extension.ts

@@ -76,7 +76,8 @@
     "extensions-ci": "node ./node_modules/gulp/bin/gulp.js extensions-ci",
     "extensions-ci-pr": "node ./node_modules/gulp/bin/gulp.js extensions-ci-pr",
     "perf": "node scripts/code-perf.js",
-    "update-build-ts-version": "npm install typescript@next && tsc -p ./build/tsconfig.build.json"
+    "update-build-ts-version": "npm install typescript@next && tsc -p ./build/tsconfig.build.json",
+    "rebuild:": "nvm use && ./rebuild.sh"
   },
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",

package.json

@@ -116,7 +116,7 @@
 	"bootstrapExtensions": [
 		{
 			"name": "ms-python.black-formatter",
-			"version": "2024.2.0",
+			"version": "2024.6.0",
 			"repo": "https://github.com/microsoft/vscode-black-formatter",
 			"metadata": {
 				"id": "859e640c-c157-47da-8699-9080b81c8371",
@@ -177,7 +177,7 @@
 
 		{
 			"name": "ms-toolsai.jupyter",
-			"version": "2024.8.1",
+			"version": "2024.11.0",
 			"repo": "https://github.com/Microsoft/vscode-jupyter",
 			"metadata": {
 				"id": "6c2f1801-1e7f-45b2-9b5c-7782f1e076e8",
@@ -192,7 +192,7 @@
 		},
 		{
 			"name": "ms-pyright.pyright",
-			"version": "1.1.379",
+			"version": "1.1.395",
 			"repo": "https://github.com/Microsoft/pyright",
 			"metadata": {
 				"id": "593fe6a5-513e-4cb3-abfb-5b9f5fe39802",
@@ -207,7 +207,7 @@
 		},
 		{
 			"name": "ms-python.debugpy",
-			"version": "2024.8.0",
+			"version": "2025.0.1",
 			"repo": "https://github.com/microsoft/vscode-python-debugger",
 			"metadata": {
 				"id": "4bd5d2c9-9d65-401a-b0b2-7498d9f17615",
@@ -233,18 +233,6 @@
 			},
 			"publisherDisplayName": "Posit Software, PBC"
 		},
-		{
-			"name": "posit.shiny",
-			"version": "1.1.2",
-			"repo": "http://github.com/posit-dev/shiny-vscode",
-			"type": "reh-web",
-			"metadata": {
-				"id": "f1b3b3b4-3b3b-4b3b-8b3b-3b3b3b3b3b3b",
-				"publisherId": "090804ff-7eb2-4fbd-bb61-583e34f2b070",
-				"displayName": "Shiny",
-				"multiPlatformServiceUrl": "https://open-vsx.org/api"
-			}
-		},
 		{
 			"name": "quarto.quarto",
 			"version": "1.118.0",

product.json

@@ -15,7 +15,6 @@ import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { Disposable } from '../../../base/common/lifecycle.js';
 
 export class PositronBootstrapExtensionsInitializer extends Disposable {
-	private readonly storageFilePath: string;
 
 	constructor(
 		@INativeEnvironmentService private readonly environmentService: INativeEnvironmentService,
@@ -26,19 +25,19 @@ export class PositronBootstrapExtensionsInitializer extends Disposable {
 	) {
 		super();
 
-		this.storageFilePath = join(this.getVSIXPath().fsPath, '.version');
+		const storageFilePath = join(this.environmentService.extensionsPath, '.version');
 		const currentVersion = this.productService.positronVersion;
 
-		const lastKnownVersion = existsSync(this.storageFilePath) ? readFileSync(this.storageFilePath, 'utf8').trim() : '';
+		const lastKnownVersion = existsSync(storageFilePath) ? readFileSync(storageFilePath, 'utf8').trim() : '';
 
 		if (lastKnownVersion !== currentVersion) {
 			this.logService.info('First launch after first install, upgrade, or downgrade. Installing bootstrapped extensions');
 			this.installVSIXOnStartup()
 				.then(() => {
 					try {
-						writeFileSync(this.storageFilePath, currentVersion);
+						writeFileSync(storageFilePath, currentVersion);
 					} catch (error) {
-						this.logService.error('Error writing bootstrapped extension storage file', this.storageFilePath, getErrorMessage(error));
+						this.logService.error('Error writing bootstrapped extension storage file', storageFilePath, getErrorMessage(error));
 					}
 				})
 				.catch(error => {

src/vs/platform/extensionManagement/node/positronBootstrapExtensionsInitializer.ts

@@ -11,6 +11,10 @@ export class MainThreadConsole {
 	) {
 	}
 
+	getLanguageId(): string {
+		return this._console.session.runtimeMetadata.languageId;
+	}
+
 	pasteText(text: string): void {
 		this._console.pasteText(text);
 	}

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

@@ -14,17 +14,22 @@ export class MainThreadConsoleService implements MainThreadConsoleServiceShape {
 
 	private readonly _disposables = new DisposableStore();
 
-	// Map of language `id` to console.
-	// Assumes each language `id` maps to at most 1 console,
-	// which may need to be relaxed in the future.
-	// Kept in sync with consoles in `ExtHostConsoleService`.
-	private readonly _mainThreadConsolesByLanguageId = new Map<string, MainThreadConsole>();
+	/**
+	 * A Map of session ids to the respective console.
+	 * Each session id maps to a single console.
+	 * Multiple sessions could map to the same console, this happens
+	 * when a user power-cycles the session for a console instance
+	 * (i.e. shutdown session for console instance, then start a session for console instance)
+	 *
+	 * Kept in sync with consoles in `ExtHostConsoleService`
+	 */
+	private readonly _mainThreadConsolesBySessionId = new Map<string, MainThreadConsole>();
 
 	private readonly _proxy: ExtHostConsoleServiceShape;
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IPositronConsoleService private readonly _positronConsoleService: IPositronConsoleService,
+		@IPositronConsoleService private readonly _positronConsoleService: IPositronConsoleService
 	) {
 		// Create the proxy for the extension host.
 		this._proxy = extHostContext.getProxy(ExtHostPositronContext.ExtHostConsoleService);
@@ -37,17 +42,17 @@ export class MainThreadConsoleService implements MainThreadConsoleServiceShape {
 				this._proxy.$onDidChangeConsoleWidth(newWidth);
 			}));
 
-		// Forward new positron console language id to the extension host, and then register it
+		// Forward new positron console session id to the extension host, and then register it
 		// in the main thread too
 		this._disposables.add(
 			this._positronConsoleService.onDidStartPositronConsoleInstance((console) => {
-				const id = console.session.runtimeMetadata.languageId;
+				const sessionId = console.session.sessionId;
 
 				// First update ext host
-				this._proxy.$addConsole(id);
+				this._proxy.$addConsole(sessionId);
 
 				// Then update main thread
-				this.addConsole(id, console);
+				this.addConsole(sessionId, console);
 			})
 		);
 
@@ -60,7 +65,7 @@ export class MainThreadConsoleService implements MainThreadConsoleServiceShape {
 		//
 		// this._disposables.add(
 		// 	this._positronConsoleService.onDidRemovePositronConsoleInstance((console) => {
-		// 		const id = console.runtime.metadata.languageId;
+		// 		const id = console.session.sessionId;
 		//
 		// 		// First update ext host
 		// 		this._proxy.$removeConsole(id);
@@ -76,12 +81,13 @@ export class MainThreadConsoleService implements MainThreadConsoleServiceShape {
 	}
 
 	private getConsoleForLanguage(id: string): MainThreadConsole | undefined {
-		return this._mainThreadConsolesByLanguageId.get(id);
+		return Array.from(this._mainThreadConsolesBySessionId.values())
+			.find(console => console.getLanguageId() === id);
 	}
 
-	private addConsole(id: string, console: IPositronConsoleInstance) {
+	private addConsole(sessionId: string, console: IPositronConsoleInstance) {
 		const mainThreadConsole = new MainThreadConsole(console);
-		this._mainThreadConsolesByLanguageId.set(id, mainThreadConsole);
+		this._mainThreadConsolesBySessionId.set(sessionId, mainThreadConsole);
 	}
 
 	// TODO:

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

@@ -41,5 +41,9 @@ export class ExtHostConsole {
 	getConsole(): positron.Console {
 		return this._value;
 	}
+
+	getLanguageId(): string {
+		return this.getLanguageId();
+	}
 }
 

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

@@ -12,11 +12,16 @@ import { dispose } from '../../../../base/common/lifecycle.js';
 
 export class ExtHostConsoleService implements extHostProtocol.ExtHostConsoleServiceShape {
 
-	// Map of language `id` to console.
-	// Assumes each language `id` maps to at most 1 console,
-	// which may need to be relaxed in the future.
-	// Kept in sync with consoles in `MainThreadConsoleService`.
-	private readonly _extHostConsolesByLanguageId = new Map<string, ExtHostConsole>;
+	/**
+	 * A Map of session ids to the respective console.
+	 * Each session id maps to a single console.
+	 * Multiple sessions could map to the same console, this happens
+	 * when a user power-cycles the session for a console instance
+	 * (i.e. shutdown session for console instance, then start a session for console instance)
+	 *
+	 * Kept in sync with consoles in `MainThreadConsoleService`
+	 */
+	private readonly _extHostConsolesBySessionId = new Map<string, ExtHostConsole>();
 
 	private readonly _onDidChangeConsoleWidth = new Emitter<number>();
 
@@ -41,7 +46,9 @@ export class ExtHostConsoleService implements extHostProtocol.ExtHostConsoleServ
 	}
 
 	getConsoleForLanguage(id: string): positron.Console | undefined {
-		const extHostConsole = this._extHostConsolesByLanguageId.get(id);
+		// find a console for this langauge id
+		const extHostConsole = Array.from(this._extHostConsolesBySessionId.values())
+			.find(extHostConsole => extHostConsole.getLanguageId() === id);
 
 		if (!extHostConsole) {
 			// Console for this language `id` doesn't exist yet
@@ -62,14 +69,13 @@ export class ExtHostConsoleService implements extHostProtocol.ExtHostConsoleServ
 	// Called when a new console instance is started
 	$addConsole(id: string): void {
 		const extHostConsole = new ExtHostConsole(id, this._proxy, this._logService);
-		this._extHostConsolesByLanguageId.set(id, extHostConsole);
+		this._extHostConsolesBySessionId.set(id, extHostConsole);
 	}
 
 	// Called when a console instance is removed
 	$removeConsole(id: string): void {
-		const extHostConsole = this._extHostConsolesByLanguageId.get(id);
-		this._extHostConsolesByLanguageId.delete(id);
-
+		const extHostConsole = this._extHostConsolesBySessionId.get(id);
+		this._extHostConsolesBySessionId.delete(id);
 		// "Dispose" of an `ExtHostConsole`, ensuring that future API calls warn / error
 		dispose(extHostConsole);
 	}