Initial implementation of changing handle

src/vs/platform/native/common/native.ts

@@ -75,6 +75,7 @@ export interface ICommonNativeHostService {
 	getWindowCount(): Promise<number>;
 	getActiveWindowId(): Promise<number | undefined>;
 	getActiveWindowPosition(): Promise<IRectangle | undefined>;
+	getActiveWindowNativeHandle(id: number): Promise<string | undefined>;
 
 	openWindow(options?: IOpenEmptyWindowOptions): Promise<void>;
 	openWindow(toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;

src/vs/platform/native/electron-main/nativeHostMainService.ts

@@ -189,6 +189,10 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		return undefined;
 	}
 
+	async getActiveWindowNativeHandle(windowId: number | undefined, id: number): Promise<string | undefined> {
+		return this.windowById(id, windowId)?.win?.getNativeWindowHandle().toString('base64');
+	}
+
 	openWindow(windowId: number | undefined, options?: IOpenEmptyWindowOptions): Promise<void>;
 	openWindow(windowId: number | undefined, toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;
 	openWindow(windowId: number | undefined, arg1?: IOpenEmptyWindowOptions | IWindowOpenable[], arg2?: IOpenWindowOptions): Promise<void> {

src/vs/workbench/api/browser/mainThreadWindow.ts

@@ -11,6 +11,7 @@ import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions
 import { ExtHostContext, ExtHostWindowShape, IOpenUriOptions, MainContext, MainThreadWindowShape } from '../common/extHost.protocol.js';
 import { IHostService } from '../../services/host/browser/host.js';
 import { IUserActivityService } from '../../services/userActivity/common/userActivityService.js';
+import { INativeHostService } from '../../../platform/native/common/native.js';
 
 @extHostNamedCustomer(MainContext.MainThreadWindow)
 export class MainThreadWindow implements MainThreadWindowShape {
@@ -21,6 +22,7 @@ export class MainThreadWindow implements MainThreadWindowShape {
 	constructor(
 		extHostContext: IExtHostContext,
 		@IHostService private readonly hostService: IHostService,
+		@INativeHostService private readonly nativeHostService: INativeHostService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IUserActivityService private readonly userActivityService: IUserActivityService,
 	) {
@@ -29,17 +31,26 @@ export class MainThreadWindow implements MainThreadWindowShape {
 		Event.latch(hostService.onDidChangeFocus)
 			(this.proxy.$onDidChangeWindowFocus, this.proxy, this.disposables);
 		userActivityService.onDidChangeIsActive(this.proxy.$onDidChangeWindowActive, this.proxy, this.disposables);
+		this.disposables.add(hostService.onDidChangeActiveWindow((id) => this.onDidChangeActiveWindow(id)));
 	}
 
 	dispose(): void {
 		this.disposables.dispose();
 	}
 
-	$getInitialState() {
-		return Promise.resolve({
+	private onDidChangeActiveWindow(id: number): void {
+		this.nativeHostService.getActiveWindowNativeHandle(id).then(nativeHandle => {
+			this.proxy.$onDidChangeActiveWindowHandle(nativeHandle);
+		});
+	}
+
+	async $getInitialState() {
+		const nativeHandle = await this.nativeHostService.getActiveWindowNativeHandle(this.nativeHostService.windowId);
+		return {
 			isFocused: this.hostService.hasFocus,
 			isActive: this.userActivityService.isActive,
-		});
+			nativeHandle
+		};
 	}
 
 	async $openUri(uriComponents: UriComponents, uriString: string | undefined, options: IOpenUriOptions): Promise<boolean> {

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

@@ -439,7 +439,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			},
 			get handle(): string | undefined {
 				checkProposedApiEnabled(extension, 'nativeWindowHandle');
-				return initData.handle;
+				return extHostWindow.nativeHandle;
 			}
 		};
 		if (!initData.environment.extensionTestsLocationURI) {

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

@@ -1702,7 +1702,7 @@ export interface IOpenUriOptions {
 }
 
 export interface MainThreadWindowShape extends IDisposable {
-	$getInitialState(): Promise<{ isFocused: boolean; isActive: boolean }>;
+	$getInitialState(): Promise<{ isFocused: boolean; isActive: boolean; nativeHandle?: string }>;
 	$openUri(uri: UriComponents, uriString: string | undefined, options: IOpenUriOptions): Promise<boolean>;
 	$asExternalUri(uri: UriComponents, options: IOpenUriOptions): Promise<UriComponents>;
 }
@@ -2596,6 +2596,7 @@ export interface ExtHostDecorationsShape {
 export interface ExtHostWindowShape {
 	$onDidChangeWindowFocus(value: boolean): void;
 	$onDidChangeWindowActive(value: boolean): void;
+	$onDidChangeActiveWindowHandle(handle: string | undefined): void;
 }
 
 export interface ExtHostLogLevelServiceShape {

src/vs/workbench/api/common/extHostWindow.ts

@@ -11,6 +11,7 @@ import { createDecorator } from '../../../platform/instantiation/common/instanti
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { WindowState } from 'vscode';
 import { ExtHostWindowShape, IOpenUriOptions, MainContext, MainThreadWindowShape } from './extHost.protocol.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
 
 export class ExtHostWindow implements ExtHostWindowShape {
 
@@ -24,6 +25,7 @@ export class ExtHostWindow implements ExtHostWindowShape {
 	private readonly _onDidChangeWindowState = new Emitter<WindowState>();
 	readonly onDidChangeWindowState: Event<WindowState> = this._onDidChangeWindowState.event;
 
+	private _nativeHandle: string | undefined = this._initData.handle;
 	private _state = ExtHostWindow.InitialState;
 
 	getState(): WindowState {
@@ -40,14 +42,26 @@ export class ExtHostWindow implements ExtHostWindowShape {
 		};
 	}
 
-	constructor(@IExtHostRpcService extHostRpc: IExtHostRpcService) {
+	constructor(
+		@IExtHostInitDataService private readonly _initData: IExtHostInitDataService,
+		@IExtHostRpcService extHostRpc: IExtHostRpcService
+	) {
 		this._proxy = extHostRpc.getProxy(MainContext.MainThreadWindow);
-		this._proxy.$getInitialState().then(({ isFocused, isActive }) => {
+		this._proxy.$getInitialState().then(({ isFocused, isActive, nativeHandle }) => {
 			this.onDidChangeWindowProperty('focused', isFocused);
 			this.onDidChangeWindowProperty('active', isActive);
+			this.$onDidChangeActiveWindowHandle(nativeHandle);
 		});
 	}
 
+	get nativeHandle(): string | undefined {
+		return this._nativeHandle;
+	}
+
+	$onDidChangeActiveWindowHandle(handle: string | undefined): void {
+		this._nativeHandle = handle;
+	}
+
 	$onDidChangeWindowFocus(value: boolean) {
 		this.onDidChangeWindowProperty('focused', value);
 	}

src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts

@@ -85,6 +85,7 @@ export class TestNativeHostService implements INativeHostService {
 	async getWindows(): Promise<IOpenedMainWindow[]> { return []; }
 	async getActiveWindowId(): Promise<number | undefined> { return undefined; }
 	async getActiveWindowPosition(): Promise<IRectangle | undefined> { return undefined; }
+	async getActiveWindowNativeHandle(): Promise<string | undefined> { return undefined; }
 
 	openWindow(options?: IOpenEmptyWindowOptions): Promise<void>;
 	openWindow(toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;