From a8101c12b5bc7e3f6ef323f5fc59f58d448acdbe Mon Sep 17 00:00:00 2001
From: Matt Bierner <12821956+mjbvz@users.noreply.github.com>
Date: Fri, 3 Oct 2025 14:15:39 -0700
Subject: [PATCH 01/11] Fix any cases in md extension

For #269213
---
 .../notebook/index.ts                         | 12 ++++-----
 .../package-lock.json                         | 17 ++++++------
 .../markdown-language-features/package.json   |  6 ++---
 .../preview-src/index.ts                      | 14 +++++-----
 .../src/client/protocol.ts                    |  3 +--
 .../src/languageFeatures/diagnostics.ts       |  3 +--
 .../src/markdownEngine.ts                     | 26 +++++++++----------
 7 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/extensions/markdown-language-features/notebook/index.ts b/extensions/markdown-language-features/notebook/index.ts
index 1c6e68f4de8..3d11a7574bd 100644
--- a/extensions/markdown-language-features/notebook/index.ts
+++ b/extensions/markdown-language-features/notebook/index.ts
@@ -5,7 +5,6 @@
 
 import DOMPurify from 'dompurify';
 import MarkdownIt from 'markdown-it';
-import type * as MarkdownItToken from 'markdown-it/lib/token';
 import type { ActivationFunction } from 'vscode-notebook-renderer';
 
 const allowedHtmlTags = Object.freeze(['a',
@@ -352,11 +351,11 @@ export const activate: ActivationFunction<void> = (ctx) => {
 };
 
 
-function addNamedHeaderRendering(md: InstanceType<typeof MarkdownIt>): void {
+function addNamedHeaderRendering(md: MarkdownIt): void {
 	const slugCounter = new Map<string, number>();
 
 	const originalHeaderOpen = md.renderer.rules.heading_open;
-	md.renderer.rules.heading_open = (tokens: MarkdownItToken[], idx: number, options, env, self) => {
+	md.renderer.rules.heading_open = (tokens: MarkdownIt.Token[], idx: number, options, env, self) => {
 		const title = tokens[idx + 1].children!.reduce<string>((acc, t) => acc + t.content, '');
 		let slug = slugify(title);
 
@@ -378,17 +377,16 @@ function addNamedHeaderRendering(md: InstanceType<typeof MarkdownIt>): void {
 	};
 
 	const originalRender = md.render;
-	md.render = function () {
+	md.render = function (str: string, env?: unknown) {
 		slugCounter.clear();
-		// eslint-disable-next-line local/code-no-any-casts
-		return originalRender.apply(this, arguments as any);
+		return originalRender.call(this, str, env);
 	};
 }
 
 function addLinkRenderer(md: MarkdownIt): void {
 	const original = md.renderer.rules.link_open;
 
-	md.renderer.rules.link_open = (tokens: MarkdownItToken[], idx: number, options, env, self) => {
+	md.renderer.rules.link_open = (tokens: MarkdownIt.Token[], idx: number, options, env, self) => {
 		const token = tokens[idx];
 		const href = token.attrGet('href');
 		if (typeof href === 'string' && href.startsWith('#')) {
diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index d8169c35e67..44fee9edb84 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -14,7 +14,7 @@
         "highlight.js": "^11.8.0",
         "markdown-it": "^12.3.2",
         "markdown-it-front-matter": "^0.2.4",
-        "morphdom": "^2.7.4",
+        "morphdom": "^2.7.7",
         "picomatch": "^2.3.1",
         "punycode": "^2.3.1",
         "vscode-languageclient": "^8.0.2",
@@ -25,7 +25,7 @@
       "devDependencies": {
         "@types/dompurify": "^3.0.5",
         "@types/lodash.throttle": "^4.1.3",
-        "@types/markdown-it": "12.2.3",
+        "@types/markdown-it": "14.1.0",
         "@types/picomatch": "^2.3.0",
         "@types/vscode-notebook-renderer": "^1.60.0",
         "@types/vscode-webview": "^1.57.0",
@@ -193,10 +193,11 @@
       }
     },
     "node_modules/@types/markdown-it": {
-      "version": "12.2.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
-      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-B/o5iMXxpIAl1+792pO4ryhrNNiAus9HhrTs+Gt2m+6SIdEUEvyOIs0iqDNjTSRgbelWvyeek3UxfYYOKDaWfA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/linkify-it": "*",
         "@types/mdurl": "*"
@@ -511,9 +512,9 @@
       }
     },
     "node_modules/morphdom": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.7.4.tgz",
-      "integrity": "sha512-ATTbWMgGa+FaMU3FhnFYB6WgulCqwf6opOll4CBzmVDTLvPMmUPrEv8CudmLPK0MESa64+6B89fWOxP3+YIlxQ==",
+      "version": "2.7.7",
+      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.7.7.tgz",
+      "integrity": "sha512-04GmsiBcalrSCNmzfo+UjU8tt3PhZJKzcOy+r1FlGA7/zri8wre3I1WkYN9PT3sIeIKfW9bpyElA+VzOg2E24g==",
       "license": "MIT"
     },
     "node_modules/node-html-parser": {
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 922fe087af5..d4b197e9496 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -756,7 +756,7 @@
     ]
   },
   "scripts": {
-    "compile": "gulp compile-extension:markdown-language-features-languageService && gulp compile-extension:markdown-language-features && npm run build-preview && npm run build-notebook",
+    "compile": "gulp compile-extension:markdown-language-features && npm run build-preview && npm run build-notebook",
     "watch": "npm run build-preview && gulp watch-extension:markdown-language-features watch-extension:markdown-language-features-languageService",
     "vscode:prepublish": "npm run build-ext && npm run build-preview",
     "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:markdown-language-features ./tsconfig.json",
@@ -771,7 +771,7 @@
     "highlight.js": "^11.8.0",
     "markdown-it": "^12.3.2",
     "markdown-it-front-matter": "^0.2.4",
-    "morphdom": "^2.7.4",
+    "morphdom": "^2.7.7",
     "picomatch": "^2.3.1",
     "punycode": "^2.3.1",
     "vscode-languageclient": "^8.0.2",
@@ -782,7 +782,7 @@
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
     "@types/lodash.throttle": "^4.1.3",
-    "@types/markdown-it": "12.2.3",
+    "@types/markdown-it": "14.1.0",
     "@types/picomatch": "^2.3.0",
     "@types/vscode-notebook-renderer": "^1.60.0",
     "@types/vscode-webview": "^1.57.0",
diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index b6200b8ceb9..08475ad7fa4 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -23,8 +23,12 @@ let documentResource = settings.settings.source;
 
 const vscode = acquireVsCodeApi();
 
-// eslint-disable-next-line local/code-no-any-casts
-const originalState = vscode.getState() ?? {} as any;
+interface State {
+	scrollProgress?: number;
+	resource?: string;
+}
+
+const originalState: State = vscode.getState() ?? {};
 const state = {
 	...originalState,
 	...getData<any>('data-state')
@@ -250,7 +254,6 @@ window.addEventListener('message', async event => {
 				}
 				newRoot.prepend(...styles);
 
-				// eslint-disable-next-line local/code-no-any-casts
 				morphdom(root, newRoot, {
 					childrenOnly: true,
 					onBeforeElUpdated: (fromEl: Element, toEl: Element) => {
@@ -287,7 +290,7 @@ window.addEventListener('message', async event => {
 							domEval(childNode);
 						}
 					}
-				} as any);
+				});
 			}
 
 			++documentVersion;
@@ -441,8 +444,7 @@ function domEval(el: Element): void {
 		for (const key of preservedScriptAttributes) {
 			const val = node.getAttribute?.(key);
 			if (val) {
-				// eslint-disable-next-line local/code-no-any-casts
-				scriptTag.setAttribute(key, val as any);
+				scriptTag.setAttribute(key, val);
 			}
 		}
 
diff --git a/extensions/markdown-language-features/src/client/protocol.ts b/extensions/markdown-language-features/src/client/protocol.ts
index 69d162f8262..a822327f9ff 100644
--- a/extensions/markdown-language-features/src/client/protocol.ts
+++ b/extensions/markdown-language-features/src/client/protocol.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type Token = require('markdown-it/lib/token');
 import * as vscode from 'vscode';
 import { FileRename, RequestType } from 'vscode-languageclient';
 import type * as lsp from 'vscode-languageserver-types';
@@ -16,7 +15,7 @@ export type ResolvedDocumentLinkTarget =
 	| { readonly kind: 'external'; readonly uri: vscode.Uri };
 
 //#region From server
-export const parse = new RequestType<{ uri: string; text?: string }, Token[], any>('markdown/parse');
+export const parse = new RequestType<{ uri: string; text?: string }, md.Token[], any>('markdown/parse');
 
 export const fs_readFile = new RequestType<{ uri: string }, number[], any>('markdown/fs/readFile');
 export const fs_readDirectory = new RequestType<{ uri: string }, [string, { isDirectory: boolean }][], any>('markdown/fs/readDirectory');
diff --git a/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts b/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
index 793ea7f64ec..0ffab0b01fb 100644
--- a/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
@@ -50,8 +50,7 @@ class AddToIgnoreLinksQuickFixProvider implements vscode.CodeActionProvider {
 				case DiagnosticCode.link_noSuchHeaderInOwnFile:
 				case DiagnosticCode.link_noSuchFile:
 				case DiagnosticCode.link_noSuchHeaderInFile: {
-					// eslint-disable-next-line local/code-no-any-casts
-					const hrefText = (diagnostic as any).data?.hrefText;
+					const hrefText = (diagnostic as unknown as Record<string, any>).data?.hrefText;
 					if (hrefText) {
 						const fix = new vscode.CodeAction(
 							vscode.l10n.t("Exclude '{0}' from link validation.", hrefText),
diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts
index 733fcf9e437..6a655da5500 100644
--- a/extensions/markdown-language-features/src/markdownEngine.ts
+++ b/extensions/markdown-language-features/src/markdownEngine.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type MarkdownIt = require('markdown-it');
-import type Token = require('markdown-it/lib/token');
 import * as vscode from 'vscode';
 import { ILogger } from './logging';
 import { MarkdownContributionProvider } from './markdownExtensions';
@@ -50,9 +49,9 @@ class TokenCache {
 		readonly version: number;
 		readonly config: MarkdownItConfig;
 	};
-	private _tokens?: Token[];
+	private _tokens?: MarkdownIt.Token[];
 
-	public tryGetCached(document: ITextDocument, config: MarkdownItConfig): Token[] | undefined {
+	public tryGetCached(document: ITextDocument, config: MarkdownItConfig): MarkdownIt.Token[] | undefined {
 		if (this._cachedDocument
 			&& this._cachedDocument.uri.toString() === document.uri.toString()
 			&& document.version >= 0 && this._cachedDocument.version === document.version
@@ -64,7 +63,7 @@ class TokenCache {
 		return undefined;
 	}
 
-	public update(document: ITextDocument, config: MarkdownItConfig, tokens: Token[]) {
+	public update(document: ITextDocument, config: MarkdownItConfig, tokens: MarkdownIt.Token[]) {
 		this._cachedDocument = {
 			uri: document.uri,
 			version: document.version,
@@ -93,7 +92,7 @@ interface RenderEnv {
 export interface IMdParser {
 	readonly slugifier: Slugifier;
 
-	tokenize(document: ITextDocument): Promise<Token[]>;
+	tokenize(document: ITextDocument): Promise<MarkdownIt.Token[]>;
 }
 
 export class MarkdownItEngine implements IMdParser {
@@ -143,8 +142,7 @@ export class MarkdownItEngine implements IMdParser {
 				const frontMatterPlugin = await import('markdown-it-front-matter');
 				// Extract rules from front matter plugin and apply at a lower precedence
 				let fontMatterRule: any;
-				// eslint-disable-next-line local/code-no-any-casts
-				frontMatterPlugin.default(<any>{
+				frontMatterPlugin.default({
 					block: {
 						ruler: {
 							before: (_id: any, _id2: any, rule: any) => { fontMatterRule = rule; }
@@ -180,7 +178,7 @@ export class MarkdownItEngine implements IMdParser {
 		document: ITextDocument,
 		config: MarkdownItConfig,
 		engine: MarkdownIt
-	): Token[] {
+	): MarkdownIt.Token[] {
 		const cached = this._tokenCache.tryGetCached(document, config);
 		if (cached) {
 			this._resetSlugCount();
@@ -228,7 +226,7 @@ export class MarkdownItEngine implements IMdParser {
 		};
 	}
 
-	public async tokenize(document: ITextDocument): Promise<Token[]> {
+	public async tokenize(document: ITextDocument): Promise<MarkdownIt.Token[]> {
 		const config = this._getConfig(document.uri);
 		const engine = await this._getEngine(config);
 		return this._tokenizeDocument(document, config, engine);
@@ -249,7 +247,7 @@ export class MarkdownItEngine implements IMdParser {
 
 	private _addImageRenderer(md: MarkdownIt): void {
 		const original = md.renderer.rules.image;
-		md.renderer.rules.image = (tokens: Token[], idx: number, options, env: RenderEnv, self) => {
+		md.renderer.rules.image = (tokens: MarkdownIt.Token[], idx: number, options, env: RenderEnv, self) => {
 			const token = tokens[idx];
 			const src = token.attrGet('src');
 			if (src) {
@@ -271,7 +269,7 @@ export class MarkdownItEngine implements IMdParser {
 
 	private _addFencedRenderer(md: MarkdownIt): void {
 		const original = md.renderer.rules['fenced'];
-		md.renderer.rules['fenced'] = (tokens: Token[], idx: number, options, env, self) => {
+		md.renderer.rules['fenced'] = (tokens: MarkdownIt.Token[], idx: number, options, env, self) => {
 			const token = tokens[idx];
 			if (token.map?.length) {
 				token.attrJoin('class', 'hljs');
@@ -313,7 +311,7 @@ export class MarkdownItEngine implements IMdParser {
 
 	private _addNamedHeaders(md: MarkdownIt): void {
 		const original = md.renderer.rules.heading_open;
-		md.renderer.rules.heading_open = (tokens: Token[], idx: number, options, env, self) => {
+		md.renderer.rules.heading_open = (tokens: MarkdownIt.Token[], idx: number, options, env, self) => {
 			const title = this._tokenToPlainText(tokens[idx + 1]);
 			let slug = this.slugifier.fromHeading(title);
 
@@ -335,7 +333,7 @@ export class MarkdownItEngine implements IMdParser {
 		};
 	}
 
-	private _tokenToPlainText(token: Token): string {
+	private _tokenToPlainText(token: MarkdownIt.Token): string {
 		if (token.children) {
 			return token.children.map(x => this._tokenToPlainText(x)).join('');
 		}
@@ -353,7 +351,7 @@ export class MarkdownItEngine implements IMdParser {
 	private _addLinkRenderer(md: MarkdownIt): void {
 		const original = md.renderer.rules.link_open;
 
-		md.renderer.rules.link_open = (tokens: Token[], idx: number, options, env, self) => {
+		md.renderer.rules.link_open = (tokens: MarkdownIt.Token[], idx: number, options, env, self) => {
 			const token = tokens[idx];
 			const href = token.attrGet('href');
 			// A string, including empty string, may be `href`.

From 2de481e6cc45e3f036f360a34bbd00e52090f076 Mon Sep 17 00:00:00 2001
From: Matt Bierner <12821956+mjbvz@users.noreply.github.com>
Date: Fri, 3 Oct 2025 14:18:29 -0700
Subject: [PATCH 02/11] Also update watch script

---
 extensions/markdown-language-features/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index d4b197e9496..0210681bd14 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -757,7 +757,7 @@
   },
   "scripts": {
     "compile": "gulp compile-extension:markdown-language-features && npm run build-preview && npm run build-notebook",
-    "watch": "npm run build-preview && gulp watch-extension:markdown-language-features watch-extension:markdown-language-features-languageService",
+    "watch": "npm run build-preview && gulp watch-extension:markdown-language-features",
     "vscode:prepublish": "npm run build-ext && npm run build-preview",
     "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:markdown-language-features ./tsconfig.json",
     "build-notebook": "node ./esbuild-notebook.mjs",

From 1443559d93517d8339ce3eab65dcd1d877984fc0 Mon Sep 17 00:00:00 2001
From: Elijah King <elijahwilliamking@icloud.com>
Date: Thu, 12 Feb 2026 11:42:37 -0800
Subject: [PATCH 03/11] non-responsive panel content motion (#295011)

* fixes animation, non-responsive panels

* Improve error handling during view layout in SplitView animations
---
 src/vs/base/browser/ui/splitview/splitview.ts | 37 +++++++++++++++----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts
index c6ac50b2ded..2c72bd8d869 100644
--- a/src/vs/base/browser/ui/splitview/splitview.ts
+++ b/src/vs/base/browser/ui/splitview/splitview.ts
@@ -908,13 +908,18 @@ export class SplitView<TLayoutContext = undefined, TView extends IView<TLayoutCo
 			container.classList.add('visible');
 		}
 
-		// 6. Clip overflow on the target container while it shrinks.
-		//    Only apply for HIDE animations - for SHOW, we leave overflow alone
-		//    so that box-shadow / visual effects on the child Part are not clipped
-		//    by the parent container during the animation.
-		if (!visible) {
-			container.style.overflow = 'hidden';
-		}
+		// 6. Clip overflow on the animating container so that the view
+		//    content (rendered at its full target size) is revealed/hidden
+		//    smoothly as the container width animates.
+		container.style.overflow = 'hidden';
+
+		// The target size is the full (non-zero) panel size. During
+		// animation we re-layout the animating view at this fixed size
+		// after each frame so its content never reflows at intermediate
+		// widths/heights (prevents chat, extension icons, etc. from
+		// jumping around). Sibling views still receive interpolated sizes
+		// so the editor / bottom panel remain responsive.
+		const viewTargetSize = visible ? finalSizes[index] : startSizes[index];
 
 		// 6b. Set initial opacity for fade effect
 		container.style.opacity = visible ? '0' : '1';
@@ -925,6 +930,12 @@ export class SplitView<TLayoutContext = undefined, TView extends IView<TLayoutCo
 
 		// 8. Render the start state
 		this.layoutViews();
+		try {
+			this.viewItems[index].view.layout(viewTargetSize, 0, this.layoutContext);
+		} catch (e) {
+			console.error('Splitview: Failed to layout view during animation');
+			console.error(e);
+		}
 
 		// 9. Easing curve is pre-parsed - ready for JS evaluation
 
@@ -934,9 +945,9 @@ export class SplitView<TLayoutContext = undefined, TView extends IView<TLayoutCo
 				this.viewItems[i].size = finalSizes[i];
 			}
 			container.style.opacity = '';
+			container.style.overflow = '';
 			if (!visible) {
 				container.classList.remove('visible');
-				container.style.overflow = '';
 			}
 			this.layoutViews();
 			this.saveProportions();
@@ -996,6 +1007,16 @@ export class SplitView<TLayoutContext = undefined, TView extends IView<TLayoutCo
 
 			this.layoutViews();
 
+			// Re-layout the animating view at its full target size so its
+			// content does not reflow at intermediate sizes. The container
+			// is already at the interpolated size with overflow:hidden.
+			try {
+				this.viewItems[index].view.layout(viewTargetSize, 0, this.layoutContext);
+			} catch (e) {
+				console.error('Splitview: Failed to layout view during animation');
+				console.error(e);
+			}
+
 			if (t < 1) {
 				rafId = window.requestAnimationFrame(animate);
 			} else {

From a701cdcef1a1f669c9436728d56faa5e718b2b76 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 12 Feb 2026 20:51:27 +0100
Subject: [PATCH 04/11] refactor views and pane composite parts (#295015)

* refactor views and pane composite parts

* simplify
---
 .../browser/parts/paneCompositePart.ts        |  9 ++---
 .../browser/parts/paneCompositePartService.ts |  9 +++++
 src/vs/workbench/common/views.ts              | 10 +++---
 .../agentSessions/agentSessionsActions.ts     |  5 +--
 .../contrib/terminal/browser/terminalGroup.ts |  5 +--
 .../panecomposite/browser/panecomposite.ts    |  5 +++
 .../views/browser/viewDescriptorService.ts    |  2 +-
 .../services/views/browser/viewsService.ts    | 36 ++++---------------
 .../parts/activitybar/activitybarPart.test.ts |  3 +-
 .../test/browser/workbenchTestServices.ts     | 12 +++++--
 10 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/vs/workbench/browser/parts/paneCompositePart.ts b/src/vs/workbench/browser/parts/paneCompositePart.ts
index a431fe643f7..e46ba514858 100644
--- a/src/vs/workbench/browser/parts/paneCompositePart.ts
+++ b/src/vs/workbench/browser/parts/paneCompositePart.ts
@@ -12,7 +12,7 @@ import { IPaneComposite } from '../../common/panecomposite.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../common/views.js';
 import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { IView } from '../../../base/browser/ui/grid/grid.js';
-import { IWorkbenchLayoutService, Parts } from '../../services/layout/browser/layoutService.js';
+import { IWorkbenchLayoutService, Parts, SINGLE_WINDOW_PARTS } from '../../services/layout/browser/layoutService.js';
 import { CompositePart, ICompositePartOptions, ICompositeTitleLabel } from './compositePart.js';
 import { IPaneCompositeBarOptions, PaneCompositeBar } from './paneCompositeBar.js';
 import { Dimension, EventHelper, trackFocus, $, addDisposableListener, EventType, prepend, getWindow } from '../../../base/browser/dom.js';
@@ -48,7 +48,8 @@ export enum CompositeBarPosition {
 
 export interface IPaneCompositePart extends IView {
 
-	readonly partId: Parts.PANEL_PART | Parts.AUXILIARYBAR_PART | Parts.SIDEBAR_PART;
+	readonly partId: SINGLE_WINDOW_PARTS;
+	readonly registryId: string;
 
 	readonly onDidPaneCompositeOpen: Event<IPaneComposite>;
 	readonly onDidPaneCompositeClose: Event<IPaneComposite>;
@@ -132,7 +133,7 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 	protected contentDimension: Dimension | undefined;
 
 	constructor(
-		readonly partId: Parts.PANEL_PART | Parts.AUXILIARYBAR_PART | Parts.SIDEBAR_PART,
+		readonly partId: SINGLE_WINDOW_PARTS,
 		partOptions: ICompositePartOptions,
 		activePaneCompositeSettingsKey: string,
 		private readonly activePaneContextKey: IContextKey<string>,
@@ -142,7 +143,7 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 		titleForegroundColor: string | undefined,
 		titleBorderColor: string | undefined,
 		protected readonly location: ViewContainerLocation,
-		registryId: string,
+		readonly registryId: string,
 		private readonly globalActionsMenuId: MenuId,
 		@INotificationService notificationService: INotificationService,
 		@IStorageService storageService: IStorageService,
diff --git a/src/vs/workbench/browser/parts/paneCompositePartService.ts b/src/vs/workbench/browser/parts/paneCompositePartService.ts
index 2e5aff4d035..e10cad54ce5 100644
--- a/src/vs/workbench/browser/parts/paneCompositePartService.ts
+++ b/src/vs/workbench/browser/parts/paneCompositePartService.ts
@@ -17,6 +17,7 @@ import { ViewContainerLocation } from '../../common/views.js';
 import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
 import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { IPaneCompositePart } from './paneCompositePart.js';
+import { SINGLE_WINDOW_PARTS } from '../../services/layout/browser/layoutService.js';
 
 export class PaneCompositePartService extends Disposable implements IPaneCompositePartService {
 
@@ -47,6 +48,14 @@ export class PaneCompositePartService extends Disposable implements IPaneComposi
 		this.onDidPaneCompositeClose = Event.any(...viewContainerLocations.map(loc => Event.map(this.paneCompositeParts.get(loc)!.onDidPaneCompositeClose, composite => { return { composite, viewContainerLocation: loc }; }, eventDisposables)));
 	}
 
+	getRegistryId(viewContainerLocation: ViewContainerLocation): string {
+		return this.getPartByLocation(viewContainerLocation).registryId;
+	}
+
+	getPartId(viewContainerLocation: ViewContainerLocation): SINGLE_WINDOW_PARTS {
+		return this.getPartByLocation(viewContainerLocation).partId;
+	}
+
 	openPaneComposite(id: string | undefined, viewContainerLocation: ViewContainerLocation, focus?: boolean): Promise<IPaneComposite | undefined> {
 		return this.getPartByLocation(viewContainerLocation).openPaneComposite(id, focus);
 	}
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index 0a903822543..71d44300073 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -42,8 +42,6 @@ export const enum ViewContainerLocation {
 	AuxiliaryBar
 }
 
-export const ViewContainerLocations = [ViewContainerLocation.Sidebar, ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar];
-
 export function ViewContainerLocationToString(viewContainerLocation: ViewContainerLocation) {
 	switch (viewContainerLocation) {
 		case ViewContainerLocation.Sidebar: return 'sidebar';
@@ -175,9 +173,9 @@ export interface IViewContainersRegistry {
 	getViewContainerLocation(container: ViewContainer): ViewContainerLocation;
 
 	/**
-	 * Return the default view container from the given location
+	 * Return the default view containers from the given location
 	 */
-	getDefaultViewContainer(location: ViewContainerLocation): ViewContainer | undefined;
+	getDefaultViewContainers(location: ViewContainerLocation): ViewContainer[];
 }
 
 interface ViewOrderDelegate {
@@ -250,8 +248,8 @@ class ViewContainersRegistryImpl extends Disposable implements IViewContainersRe
 		return [...this.viewContainers.keys()].filter(location => this.getViewContainers(location).filter(viewContainer => viewContainer?.id === container.id).length > 0)[0];
 	}
 
-	getDefaultViewContainer(location: ViewContainerLocation): ViewContainer | undefined {
-		return this.defaultViewContainers.find(viewContainer => this.getViewContainerLocation(viewContainer) === location);
+	getDefaultViewContainers(location: ViewContainerLocation): ViewContainer[] {
+		return this.defaultViewContainers.filter(viewContainer => this.getViewContainerLocation(viewContainer) === location);
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.ts
index c07c6e5111a..56f51542f99 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.ts
@@ -15,7 +15,6 @@ import { IChatEditorOptions } from '../widgetHosts/editor/chatEditor.js';
 import { ChatViewId, IChatWidgetService } from '../chat.js';
 import { ACTIVE_GROUP, AUX_WINDOW_GROUP, PreferredGroup, SIDE_GROUP } from '../../../../services/editor/common/editorService.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
-import { getPartByLocation } from '../../../../services/views/browser/viewsService.js';
 import { IWorkbenchLayoutService, Position } from '../../../../services/layout/browser/layoutService.js';
 import { IAgentSessionsService } from './agentSessionsService.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
@@ -35,6 +34,7 @@ import { KeybindingWeight } from '../../../../../platform/keybinding/common/keyb
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
 import { coalesce } from '../../../../../base/common/arrays.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IPaneCompositePartService } from '../../../../services/panecomposite/browser/panecomposite.js';
 
 const AGENT_SESSIONS_CATEGORY = localize2('chatSessions', "Chat Agent Sessions");
 
@@ -834,6 +834,7 @@ abstract class UpdateChatViewWidthAction extends Action2 {
 		const viewDescriptorService = accessor.get(IViewDescriptorService);
 		const configurationService = accessor.get(IConfigurationService);
 		const viewsService = accessor.get(IViewsService);
+		const paneCompositeService = accessor.get(IPaneCompositePartService);
 
 		const chatLocation = viewDescriptorService.getViewLocationById(ChatViewId);
 		if (typeof chatLocation !== 'number') {
@@ -880,7 +881,7 @@ abstract class UpdateChatViewWidthAction extends Action2 {
 			return; // location does not allow for resize (panel top or bottom)
 		}
 
-		const part = getPartByLocation(chatLocation);
+		const part = paneCompositeService.getPartId(chatLocation);
 		let currentSize = layoutService.getSize(part);
 
 		const chatViewDefaultWidth = 300;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
index bead415e2a7..da3402de126 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
@@ -14,9 +14,9 @@ import { ViewContainerLocation, IViewDescriptorService } from '../../../common/v
 import { IShellLaunchConfig, ITerminalTabLayoutInfoById, TerminalLocation } from '../../../../platform/terminal/common/terminal.js';
 import { TerminalStatus } from './terminalStatusList.js';
 import { getWindow } from '../../../../base/browser/dom.js';
-import { getPartByLocation } from '../../../services/views/browser/viewsService.js';
 import { asArray } from '../../../../base/common/arrays.js';
 import { hasKey, isNumber, type SingleOrMany } from '../../../../base/common/types.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
 
 const enum Constants {
 	/**
@@ -278,6 +278,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 		shellLaunchConfigOrInstance: IShellLaunchConfig | ITerminalInstance | undefined,
 		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 		@ITerminalInstanceService private readonly _terminalInstanceService: ITerminalInstanceService,
+		@IPaneCompositePartService private readonly _paneCompositePartService: IPaneCompositePartService,
 		@IWorkbenchLayoutService private readonly _layoutService: IWorkbenchLayoutService,
 		@IViewDescriptorService private readonly _viewDescriptorService: IViewDescriptorService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService
@@ -612,7 +613,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 					resizeAmount *= -1;
 				}
 
-				this._layoutService.resizePart(getPartByLocation(this._terminalLocation), resizeAmount, resizeAmount);
+				this._layoutService.resizePart(this._paneCompositePartService.getPartId(this._terminalLocation), resizeAmount, resizeAmount);
 			} else {
 				this._splitPaneContainer.resizePane(this._activeInstanceIndex, direction, resizeAmount);
 			}
diff --git a/src/vs/workbench/services/panecomposite/browser/panecomposite.ts b/src/vs/workbench/services/panecomposite/browser/panecomposite.ts
index de8d0648f97..3e4e569e3c2 100644
--- a/src/vs/workbench/services/panecomposite/browser/panecomposite.ts
+++ b/src/vs/workbench/services/panecomposite/browser/panecomposite.ts
@@ -9,6 +9,7 @@ import { PaneCompositeDescriptor } from '../../../browser/panecomposite.js';
 import { IProgressIndicator } from '../../../../platform/progress/common/progress.js';
 import { IPaneComposite } from '../../../common/panecomposite.js';
 import { ViewContainerLocation } from '../../../common/views.js';
+import { SINGLE_WINDOW_PARTS } from '../../layout/browser/layoutService.js';
 
 export const IPaneCompositePartService = createDecorator<IPaneCompositePartService>('paneCompositePartService');
 
@@ -19,6 +20,10 @@ export interface IPaneCompositePartService {
 	readonly onDidPaneCompositeOpen: Event<{ composite: IPaneComposite; viewContainerLocation: ViewContainerLocation }>;
 	readonly onDidPaneCompositeClose: Event<{ composite: IPaneComposite; viewContainerLocation: ViewContainerLocation }>;
 
+	getRegistryId(viewContainerLocation: ViewContainerLocation): string;
+
+	getPartId(viewContainerLocation: ViewContainerLocation): SINGLE_WINDOW_PARTS;
+
 	/**
 	 * Opens a viewlet with the given identifier and pass keyboard focus to it if specified.
 	 */
diff --git a/src/vs/workbench/services/views/browser/viewDescriptorService.ts b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
index a25cf00bfc9..62cf852a83b 100644
--- a/src/vs/workbench/services/views/browser/viewDescriptorService.ts
+++ b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
@@ -308,7 +308,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 	}
 
 	getDefaultViewContainer(location: ViewContainerLocation): ViewContainer | undefined {
-		return this.viewContainersRegistry.getDefaultViewContainer(location);
+		return this.viewContainersRegistry.getDefaultViewContainers(location)[0];
 	}
 
 	canMoveViews(): boolean {
diff --git a/src/vs/workbench/services/views/browser/viewsService.ts b/src/vs/workbench/services/views/browser/viewsService.ts
index 4938ebb966b..69c6c0c252a 100644
--- a/src/vs/workbench/services/views/browser/viewsService.ts
+++ b/src/vs/workbench/services/views/browser/viewsService.ts
@@ -23,7 +23,7 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IExtensionService } from '../../extensions/common/extensions.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { PaneCompositeDescriptor, PaneCompositeRegistry, Extensions as PaneCompositeExtensions, PaneComposite } from '../../../browser/panecomposite.js';
+import { PaneCompositeDescriptor, PaneCompositeRegistry, PaneComposite } from '../../../browser/panecomposite.js';
 import { IWorkbenchLayoutService, Parts } from '../../layout/browser/layoutService.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IProgressIndicator } from '../../../../platform/progress/common/progress.js';
@@ -150,7 +150,7 @@ export class ViewsService extends Disposable implements IViewsService {
 
 		// Open view container if part is visible and there is only one view container in location
 		if (
-			this.layoutService.isVisible(getPartByLocation(to)) &&
+			this.layoutService.isVisible(this.paneCompositeService.getPartId(to)) &&
 			this.viewDescriptorService.getViewContainersByLocation(to).filter(vc => this.isViewContainerActive(vc.id)).length === 1
 		) {
 			this.openViewContainer(viewContainer.id);
@@ -257,7 +257,7 @@ export class ViewsService extends Disposable implements IViewsService {
 			const viewContainerLocation = this.viewDescriptorService.getViewContainerLocation(viewContainer);
 			const isActive = viewContainerLocation !== null && this.paneCompositeService.getActivePaneComposite(viewContainerLocation);
 			if (viewContainerLocation !== null) {
-				return isActive ? this.layoutService.setPartHidden(true, getPartByLocation(viewContainerLocation)) : undefined;
+				return isActive ? this.layoutService.setPartHidden(true, this.paneCompositeService.getPartId(viewContainerLocation)) : undefined;
 			}
 		}
 	}
@@ -528,7 +528,7 @@ export class ViewsService extends Disposable implements IViewsService {
 						editorGroupService.activeGroup.focus();
 					} else if (viewLocation !== null) {
 						// otherwise hide the part where the view lives if focused
-						layoutService.setPartHidden(true, getPartByLocation(viewLocation));
+						layoutService.setPartHidden(true, that.paneCompositeService.getPartId(viewLocation));
 					}
 				} else {
 					await viewsService.openView(viewDescriptor.id, !options?.preserveFocus);
@@ -670,7 +670,7 @@ export class ViewsService extends Disposable implements IViewsService {
 			}
 		}
 
-		Registry.as<PaneCompositeRegistry>(getPaneCompositeExtension(viewContainerLocation)).registerPaneComposite(PaneCompositeDescriptor.create(
+		Registry.as<PaneCompositeRegistry>(this.paneCompositeService.getRegistryId(viewContainerLocation)).registerPaneComposite(PaneCompositeDescriptor.create(
 			PaneContainer,
 			viewContainer.id,
 			typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.value,
@@ -682,7 +682,7 @@ export class ViewsService extends Disposable implements IViewsService {
 	}
 
 	private deregisterPaneComposite(viewContainer: ViewContainer, viewContainerLocation: ViewContainerLocation): void {
-		Registry.as<PaneCompositeRegistry>(getPaneCompositeExtension(viewContainerLocation)).deregisterPaneComposite(viewContainer.id);
+		Registry.as<PaneCompositeRegistry>(this.paneCompositeService.getRegistryId(viewContainerLocation)).deregisterPaneComposite(viewContainer.id);
 	}
 
 	private createViewPaneContainer(element: HTMLElement, viewContainer: ViewContainer, viewContainerLocation: ViewContainerLocation, disposables: DisposableStore, instantiationService: IInstantiationService): ViewPaneContainer {
@@ -712,28 +712,4 @@ export class ViewsService extends Disposable implements IViewsService {
 
 function getEnabledViewContainerContextKey(viewContainerId: string): string { return `viewContainer.${viewContainerId}.enabled`; }
 
-function getPaneCompositeExtension(viewContainerLocation: ViewContainerLocation): string {
-	switch (viewContainerLocation) {
-		case ViewContainerLocation.AuxiliaryBar:
-			return PaneCompositeExtensions.Auxiliary;
-		case ViewContainerLocation.Panel:
-			return PaneCompositeExtensions.Panels;
-		case ViewContainerLocation.Sidebar:
-		default:
-			return PaneCompositeExtensions.Viewlets;
-	}
-}
-
-export function getPartByLocation(viewContainerLocation: ViewContainerLocation): Parts.AUXILIARYBAR_PART | Parts.SIDEBAR_PART | Parts.PANEL_PART {
-	switch (viewContainerLocation) {
-		case ViewContainerLocation.AuxiliaryBar:
-			return Parts.AUXILIARYBAR_PART;
-		case ViewContainerLocation.Panel:
-			return Parts.PANEL_PART;
-		case ViewContainerLocation.Sidebar:
-		default:
-			return Parts.SIDEBAR_PART;
-	}
-}
-
 registerSingleton(IViewsService, ViewsService, InstantiationType.Eager /* Eager because it registers viewlets and panels in the constructor which are required during workbench layout */);
diff --git a/src/vs/workbench/test/browser/parts/activitybar/activitybarPart.test.ts b/src/vs/workbench/test/browser/parts/activitybar/activitybarPart.test.ts
index e28ed97e587..2cfc1d0f8c2 100644
--- a/src/vs/workbench/test/browser/parts/activitybar/activitybarPart.test.ts
+++ b/src/vs/workbench/test/browser/parts/activitybar/activitybarPart.test.ts
@@ -18,13 +18,14 @@ import { IConfigurationChangeEvent } from '../../../../../platform/configuration
 import { IPaneCompositePart } from '../../../../browser/parts/paneCompositePart.js';
 import { Event, Emitter } from '../../../../../base/common/event.js';
 import { IPaneComposite } from '../../../../common/panecomposite.js';
-import { PaneCompositeDescriptor } from '../../../../browser/panecomposite.js';
+import { Extensions, PaneCompositeDescriptor } from '../../../../browser/panecomposite.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ViewContainerLocation } from '../../../../common/views.js';
 
 class StubPaneCompositePart implements IPaneCompositePart {
 	declare readonly _serviceBrand: undefined;
 	readonly partId = Parts.SIDEBAR_PART;
+	readonly registryId = Extensions.Viewlets;
 	element: HTMLElement = undefined!;
 	minimumWidth = 0;
 	maximumWidth = 0;
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index 4d70e2e4a4b..5f9844e71e8 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -114,7 +114,7 @@ import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from
 import { TestWorkspace } from '../../../platform/workspace/test/common/testWorkspace.js';
 import { IEnterWorkspaceResult, IRecent, IRecentlyOpened, IWorkspaceFolderCreationData, IWorkspacesService } from '../../../platform/workspaces/common/workspaces.js';
 import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../browser/editor.js';
-import { PaneComposite, PaneCompositeDescriptor } from '../../browser/panecomposite.js';
+import { PaneComposite, PaneCompositeDescriptor, Extensions as PaneCompositeExtensions } from '../../browser/panecomposite.js';
 import { Part } from '../../browser/part.js';
 import { DEFAULT_EDITOR_PART_OPTIONS, EditorServiceImpl, IEditorGroupsView, IEditorGroupTitleHeight, IEditorGroupView } from '../../browser/parts/editor/editor.js';
 import { EditorPane } from '../../browser/parts/editor/editorPane.js';
@@ -164,7 +164,7 @@ import { IHistoryService } from '../../services/history/common/history.js';
 import { IHostService, IToastOptions, IToastResult } from '../../services/host/browser/host.js';
 import { LabelService } from '../../services/label/common/labelService.js';
 import { ILanguageDetectionService } from '../../services/languageDetection/common/languageDetectionWorkerService.js';
-import { IPartVisibilityChangeEvent, IWorkbenchLayoutService, PanelAlignment, Position as PartPosition, Parts } from '../../services/layout/browser/layoutService.js';
+import { IPartVisibilityChangeEvent, IWorkbenchLayoutService, PanelAlignment, Position as PartPosition, Parts, SINGLE_WINDOW_PARTS } from '../../services/layout/browser/layoutService.js';
 import { ILifecycleService, InternalBeforeShutdownEvent, IWillShutdownEventJoiner, ShutdownReason, WillShutdownEvent } from '../../services/lifecycle/common/lifecycle.js';
 import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
 import { IPathService } from '../../services/path/common/pathService.js';
@@ -724,6 +724,12 @@ export class TestPaneCompositeService extends Disposable implements IPaneComposi
 		this.onDidPaneCompositeClose = Event.any(...([ViewContainerLocation.Panel, ViewContainerLocation.Sidebar].map(loc => Event.map(this.parts.get(loc)!.onDidPaneCompositeClose, composite => { return { composite, viewContainerLocation: loc }; }))));
 	}
 
+	getPartId(viewContainerLocation: ViewContainerLocation): SINGLE_WINDOW_PARTS {
+		return this.getPartByLocation(viewContainerLocation).partId;
+	}
+	getRegistryId(viewContainerLocation: ViewContainerLocation): string {
+		return this.getPartByLocation(viewContainerLocation).registryId;
+	}
 	openPaneComposite(id: string | undefined, viewContainerLocation: ViewContainerLocation, focus?: boolean): Promise<IPaneComposite | undefined> {
 		return this.getPartByLocation(viewContainerLocation).openPaneComposite(id, focus);
 	}
@@ -772,6 +778,7 @@ export class TestSideBarPart implements IPaneCompositePart {
 	onDidViewletCloseEmitter = new Emitter<IPaneComposite>();
 
 	readonly partId = Parts.SIDEBAR_PART;
+	readonly registryId = PaneCompositeExtensions.Viewlets;
 	element: HTMLElement = undefined!;
 	minimumWidth = 0;
 	maximumWidth = 0;
@@ -809,6 +816,7 @@ export class TestPanelPart implements IPaneCompositePart {
 	onDidPaneCompositeOpen = new Emitter<IPaneComposite>().event;
 	onDidPaneCompositeClose = new Emitter<IPaneComposite>().event;
 	readonly partId = Parts.AUXILIARYBAR_PART;
+	readonly registryId = PaneCompositeExtensions.Auxiliary;
 
 	async openPaneComposite(id?: string, focus?: boolean): Promise<undefined> { return undefined; }
 	getPaneComposite(id: string): any { return activeViewlet; }

From d6c955c0f87976f3fcf4c9ae30ed6b6060c81569 Mon Sep 17 00:00:00 2001
From: Kyle Cutler <67761731+kycutler@users.noreply.github.com>
Date: Thu, 12 Feb 2026 11:55:05 -0800
Subject: [PATCH 05/11] Browser: DevTools protocol support (#294019)

* Browser: DevTools protocol support

* PR feedback

* simplify

* feedback, fixes

* fix
---
 .../platform/browserView/common/cdp/proxy.ts  | 399 ++++++++++++++++++
 .../platform/browserView/common/cdp/types.ts  | 191 +++++++++
 .../electron-main/browserSession.ts           | 215 ++++++++++
 .../browserView/electron-main/browserView.ts  |  57 ++-
 .../electron-main/browserViewDebugger.ts      | 211 +++++++++
 .../electron-main/browserViewMainService.ts   | 231 +++++++---
 6 files changed, 1225 insertions(+), 79 deletions(-)
 create mode 100644 src/vs/platform/browserView/common/cdp/proxy.ts
 create mode 100644 src/vs/platform/browserView/common/cdp/types.ts
 create mode 100644 src/vs/platform/browserView/electron-main/browserSession.ts
 create mode 100644 src/vs/platform/browserView/electron-main/browserViewDebugger.ts

diff --git a/src/vs/platform/browserView/common/cdp/proxy.ts b/src/vs/platform/browserView/common/cdp/proxy.ts
new file mode 100644
index 00000000000..e11b7b26389
--- /dev/null
+++ b/src/vs/platform/browserView/common/cdp/proxy.ts
@@ -0,0 +1,399 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ICDPTarget, CDPEvent, CDPError, CDPServerError, CDPMethodNotFoundError, CDPInvalidParamsError, ICDPConnection, CDPTargetInfo, ICDPBrowserTarget } from './types.js';
+
+/**
+ * CDP protocol handler for browser-level connections.
+ * Manages Browser.* and Target.* domains, routes page-level commands
+ * to the appropriate attached session by sessionId.
+ */
+export class CDPBrowserProxy extends Disposable implements ICDPConnection {
+	readonly sessionId = `browser-session-${generateUuid()}`;
+
+	// Browser session state
+	private _isAttachedToBrowserTarget = false;
+	private _autoAttach = false;
+	private _discover = false;
+
+	private readonly _targets = this._register(new TargetManager());
+
+	// sessionId -> ICDPConnection (keyed by real session ID from target)
+	private readonly _sessions = this._register(new DisposableMap<string, ICDPConnection>());
+	private readonly _sessionTargetIds = new WeakMap<ICDPConnection, string>();
+	// Only auto-attach once per target.
+	private readonly _autoAttachments = new WeakMap<ICDPTarget, Promise<ICDPConnection>>();
+
+	// CDP method handlers map
+	private readonly _handlers = new Map<string, (params: unknown, sessionId?: string) => Promise<object> | object>([
+		// Browser.* methods (https://chromedevtools.github.io/devtools-protocol/tot/Browser/)
+		['Browser.addPrivacySandboxCoordinatorKeyConfig', () => ({})],
+		['Browser.addPrivacySandboxEnrollmentOverride', () => ({})],
+		['Browser.close', () => ({})],
+		['Browser.getVersion', () => this.browserTarget.getVersion()],
+		['Browser.resetPermissions', () => ({})],
+		['Browser.getWindowForTarget', (p, s) => this.handleBrowserGetWindowForTarget(p as { targetId?: string; sessionId?: string }, s)],
+		['Browser.setDownloadBehavior', () => ({})],
+		['Browser.setWindowBounds', () => ({})],
+		// Target.* methods (https://chromedevtools.github.io/devtools-protocol/tot/Target/)
+		['Target.activateTarget', (p) => this.handleTargetActivateTarget(p as { targetId: string })],
+		['Target.attachToTarget', (p) => this.handleTargetAttachToTarget(p as { targetId: string; flatten?: boolean })],
+		['Target.closeTarget', (p) => this.handleTargetCloseTarget(p as { targetId: string })],
+		['Target.createBrowserContext', () => this.handleTargetCreateBrowserContext()],
+		['Target.createTarget', (p) => this.handleTargetCreateTarget(p as { url?: string; browserContextId?: string })],
+		['Target.detachFromTarget', (p) => this.handleTargetDetachFromTarget(p as { sessionId: string })],
+		['Target.disposeBrowserContext', (p) => this.handleTargetDisposeBrowserContext(p as { browserContextId: string })],
+		['Target.getBrowserContexts', () => this.handleTargetGetBrowserContexts()],
+		['Target.getTargets', () => this.handleTargetGetTargets()],
+		['Target.setAutoAttach', (p) => this.handleTargetSetAutoAttach(p as { autoAttach?: boolean; flatten?: boolean })],
+		['Target.setDiscoverTargets', (p) => this.handleTargetSetDiscoverTargets(p as { discover?: boolean })],
+		['Target.attachToBrowserTarget', () => this.handleTargetAttachToBrowserTarget()],
+		['Target.getTargetInfo', (p) => this.handleTargetGetTargetInfo(p as { targetId?: string } | undefined)],
+	]);
+
+	constructor(
+		private readonly browserTarget: ICDPBrowserTarget,
+	) {
+		super();
+
+		this._targets.onDidRegisterTarget(async ({ targetInfo }) => {
+			if (this._discover) {
+				this.sendBrowserEvent('Target.targetCreated', { targetInfo });
+			}
+			if (this._autoAttach) {
+				await this.attachToTarget(targetInfo.targetId, true);
+			}
+		});
+		this._targets.onDidUnregisterTarget(async ({ targetInfo }) => {
+			if (this._discover) {
+				this.sendBrowserEvent('Target.targetDestroyed', { targetId: targetInfo.targetId });
+			}
+		});
+
+		// Subscribe to browser target events
+		this._register(this.browserTarget.onTargetCreated(target => this._targets.register(target)));
+		this._register(this.browserTarget.onTargetDestroyed(target => this._targets.unregister(target)));
+
+		// Register existing targets
+		for (const target of this.browserTarget.getTargets()) {
+			void this._targets.register(target);
+		}
+	}
+
+	// #region Public API
+
+	// Events to external client (ICDPConnection)
+	private readonly _onEvent = this._register(new Emitter<CDPEvent>());
+	readonly onEvent: Event<CDPEvent> = this._onEvent.event;
+	private readonly _onClose = this._register(new Emitter<void>());
+	readonly onClose: Event<void> = this._onClose.event;
+
+	/**
+	 * Send a CDP message and await the result.
+	 * Browser-level handlers (Browser.*, Target.*) are checked first.
+	 * Other commands are routed to the page session identified by sessionId.
+	 */
+	async sendMessage(method: string, params: unknown = {}, sessionId?: string): Promise<unknown> {
+		try {
+			// Browser-level command handling
+			if (
+				!sessionId ||
+				sessionId === this.sessionId ||
+				method.startsWith('Browser.') ||
+				method.startsWith('Target.')
+			) {
+				const handler = this._handlers.get(method);
+				if (!handler) {
+					throw new CDPMethodNotFoundError(method);
+				}
+				return await handler(params, sessionId);
+			}
+
+			const connection = this._sessions.get(sessionId);
+			if (!connection) {
+				throw new CDPServerError(`Session not found: ${sessionId}`);
+			}
+
+			const result = await connection.sendMessage(method, params);
+			return result ?? {};
+		} catch (error) {
+			if (error instanceof CDPError) {
+				throw error;
+			}
+			throw new CDPServerError(error instanceof Error ? error.message : 'Unknown error');
+		}
+	}
+
+	// #endregion
+
+	// #region CDP Commands
+
+	private handleBrowserGetWindowForTarget({ targetId }: { targetId?: string }, sessionId?: string) {
+		const resolvedTargetId = (sessionId && this.findTargetIdForSession(sessionId)) ?? targetId;
+		if (!resolvedTargetId) {
+			throw new CDPServerError('Unable to resolve target');
+		}
+
+		const target = this._targets.getById(resolvedTargetId);
+		return this.browserTarget.getWindowForTarget(target);
+	}
+
+	private handleTargetGetBrowserContexts() {
+		return { browserContextIds: this.browserTarget.getBrowserContexts() };
+	}
+
+	private async handleTargetCreateBrowserContext() {
+		const browserContextId = await this.browserTarget.createBrowserContext();
+		return { browserContextId };
+	}
+
+	private async handleTargetDisposeBrowserContext({ browserContextId }: { browserContextId: string }) {
+		await this.browserTarget.disposeBrowserContext(browserContextId);
+		return {};
+	}
+
+	private handleTargetAttachToBrowserTarget() {
+		this._isAttachedToBrowserTarget = true;
+		return { sessionId: this.sessionId };
+	}
+
+	private handleTargetActivateTarget({ targetId }: { targetId: string }) {
+		const target = this._targets.getById(targetId);
+		return this.browserTarget.activateTarget(target);
+	}
+
+	private async handleTargetSetAutoAttach({ autoAttach = false, flatten }: { autoAttach?: boolean; flatten?: boolean }) {
+		if (!flatten) {
+			throw new CDPInvalidParamsError('This implementation only supports auto-attach with flatten=true');
+		}
+
+		// Note: auto-attach only attaches to new targets, not to existing ones.
+		this._autoAttach = autoAttach;
+
+		return {};
+	}
+
+	private async handleTargetSetDiscoverTargets({ discover = false }: { discover?: boolean }) {
+		if (discover !== this._discover) {
+			this._discover = discover;
+
+			if (this._discover) {
+				// Announce all existing targets
+				for (const targetInfo of this._targets.getAllInfos()) {
+					this.sendBrowserEvent('Target.targetCreated', { targetInfo });
+				}
+			}
+		}
+
+		return {};
+	}
+
+	private async handleTargetGetTargets() {
+		return { targetInfos: this._targets.getAllInfos() };
+	}
+
+	private async handleTargetGetTargetInfo({ targetId }: { targetId?: string } = {}) {
+		if (!targetId) {
+			// No targetId specified -- return info about the browser target itself
+			return { targetInfo: await this.browserTarget.getTargetInfo() };
+		}
+
+		const target = this._targets.getById(targetId);
+		return { targetInfo: await target.getTargetInfo() };
+	}
+
+	private async handleTargetAttachToTarget({ targetId, flatten }: { targetId: string; flatten?: boolean }) {
+		if (!flatten) {
+			throw new CDPInvalidParamsError('This implementation only supports attachToTarget with flatten=true');
+		}
+
+		const connection = await this.attachToTarget(targetId, false);
+		return { sessionId: connection.sessionId };
+	}
+
+	private async handleTargetDetachFromTarget({ sessionId }: { sessionId: string }) {
+		const connection = this._sessions.get(sessionId);
+		if (!connection) {
+			throw new CDPServerError(`Session not found: ${sessionId}`);
+		}
+
+		connection.dispose();
+		return {};
+	}
+
+	private async handleTargetCreateTarget({ url, browserContextId }: { url?: string; browserContextId?: string }) {
+		const target = await this.browserTarget.createTarget(url || 'about:blank', browserContextId);
+		const targetInfo = await this._targets.register(target);
+
+		// Playwright expects the attachment to happen before createTarget returns.
+		if (this._autoAttach) {
+			await this.attachToTarget(targetInfo.targetId, true);
+		}
+
+		return { targetId: targetInfo.targetId };
+	}
+
+	private async handleTargetCloseTarget({ targetId }: { targetId: string }) {
+		try {
+			await this.browserTarget.closeTarget(this._targets.getById(targetId));
+			return { success: true };
+		} catch {
+			return { success: false };
+		}
+	}
+
+	// #endregion
+
+	// #region Internal Helpers
+
+	/** Find the targetId for a given sessionId */
+	private findTargetIdForSession(sessionId: string): string | undefined {
+		const connection = this._sessions.get(sessionId);
+		if (!connection) {
+			return undefined;
+		}
+		return this._sessionTargetIds.get(connection);
+	}
+
+	/** Send a browser-level event to the client */
+	private sendBrowserEvent(method: string, params: unknown): void {
+		const sessionId = this._isAttachedToBrowserTarget ? this.sessionId : undefined;
+		this._onEvent.fire({ method, params, sessionId });
+	}
+
+	/** Attach to a target, creating a named session */
+	private async attachToTarget(targetId: string, isAutoAttach: boolean): Promise<ICDPConnection> {
+		const target = this._targets.getById(targetId);
+		if (isAutoAttach) {
+			if (this._autoAttachments.has(target)) {
+				return this._autoAttachments.get(target)!;
+			}
+		}
+
+		const attachmentPromise = (async () => {
+			const connection = await target.attach();
+			const sessionId = connection.sessionId;
+
+			this._sessions.set(sessionId, connection);
+			this._sessionTargetIds.set(connection, targetId);
+
+			const targetInfo = await target.getTargetInfo();
+
+			// Forward non-Target.* events to the external client, tagged with the sessionId.
+			connection.onEvent(event => {
+				if (!event.method.startsWith('Target.')) {
+					this._onEvent.fire({
+						method: event.method,
+						params: event.params,
+						sessionId
+					});
+				}
+			});
+			connection.onClose(() => {
+				this.sendBrowserEvent('Target.detachedFromTarget', { sessionId, targetId });
+				this._sessions.deleteAndDispose(sessionId);
+				this._sessionTargetIds.delete(connection);
+
+				if (this._autoAttachments.get(target) === attachmentPromise) {
+					this._autoAttachments.delete(target);
+				}
+			});
+
+			this.sendBrowserEvent('Target.attachedToTarget', {
+				sessionId,
+				targetInfo: { ...targetInfo, attached: true },
+
+				// Normally this would be configured by the client in `Target.setAutoAttach`,
+				// but Electron doesn't allow us to control this, so we hardcode it to false.
+				waitingForDebugger: false
+			});
+
+			return connection;
+		})();
+
+		if (isAutoAttach) {
+			this._autoAttachments.set(target, attachmentPromise);
+		}
+
+		return attachmentPromise;
+	}
+
+	// #endregion
+}
+
+/**
+ * Getting target info is an asynchronous operation, but we want to avoid emitting duplicate events
+ * if the same target object is registered multiple times before getTargetInfo resolves.
+ *
+ * This class manages that deduplication and maintains the mapping between target objects and their resolved target info.
+ */
+class TargetManager extends Disposable {
+	// Synchronous dedup: tracks target objects we have already started processing.
+	private readonly _knownTargets = new WeakSet<ICDPTarget>();
+	// target object -> targetInfo (populated async after getTargetInfo)
+	private readonly _targetInfos = new WeakMap<ICDPTarget, CDPTargetInfo>();
+	// targetId -> target object (reverse lookup, populated alongside _targetInfos)
+	private readonly _targetsByID = new Map<string, ICDPTarget>();
+
+	private readonly _onDidRegisterTarget = this._register(new Emitter<{ target: ICDPTarget; targetInfo: CDPTargetInfo }>());
+	readonly onDidRegisterTarget: Event<{ target: ICDPTarget; targetInfo: CDPTargetInfo }> = this._onDidRegisterTarget.event;
+	private readonly _onDidUnregisterTarget = this._register(new Emitter<{ target: ICDPTarget; targetInfo: CDPTargetInfo }>());
+	readonly onDidUnregisterTarget: Event<{ target: ICDPTarget; targetInfo: CDPTargetInfo }> = this._onDidUnregisterTarget.event;
+
+	getById(targetId: string): ICDPTarget {
+		const target = this._targetsByID.get(targetId);
+		if (!target) {
+			throw new CDPServerError(`Unknown targetId: ${targetId}`);
+		}
+		return target;
+	}
+
+	*getAllInfos(): IterableIterator<CDPTargetInfo> {
+		for (const target of this._targetsByID.values()) {
+			yield this._targetInfos.get(target)!;
+		}
+	}
+
+	async register(target: ICDPTarget): Promise<CDPTargetInfo> {
+		// Synchronous dedup - if this target object was already seen, just
+		// return its info without emitting duplicate events.
+		if (this._knownTargets.has(target)) {
+			return target.getTargetInfo();
+		}
+		this._knownTargets.add(target);
+
+		// Resolve the targetId asynchronously
+		const targetInfo = await target.getTargetInfo();
+		if (!this._knownTargets.has(target)) {
+			// Target was unregistered before getTargetInfo resolved. Don't register or emit events.
+			return targetInfo;
+		}
+
+		this._targetInfos.set(target, targetInfo);
+		this._targetsByID.set(targetInfo.targetId, target);
+
+		// Emit creation event
+		this._onDidRegisterTarget.fire({ target, targetInfo });
+
+		return targetInfo;
+	}
+
+	async unregister(target: ICDPTarget): Promise<void> {
+		if (!this._knownTargets.has(target)) {
+			return;
+		}
+		this._knownTargets.delete(target);
+
+		const targetInfo = this._targetInfos.get(target);
+		if (targetInfo) {
+			this._targetInfos.delete(target);
+			this._targetsByID.delete(targetInfo.targetId);
+			this._onDidUnregisterTarget.fire({ target, targetInfo });
+		}
+	}
+}
diff --git a/src/vs/platform/browserView/common/cdp/types.ts b/src/vs/platform/browserView/common/cdp/types.ts
new file mode 100644
index 00000000000..603467e3ed2
--- /dev/null
+++ b/src/vs/platform/browserView/common/cdp/types.ts
@@ -0,0 +1,191 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Event } from '../../../../base/common/event.js';
+import type { IDisposable } from '../../../../base/common/lifecycle.js';
+
+/**
+ * CDP error codes following JSON-RPC 2.0 conventions
+ */
+export const CDPErrorCode = {
+	/** Method not found */
+	MethodNotFound: -32601,
+	/** Invalid params */
+	InvalidParams: -32602,
+	/** Internal error */
+	InternalError: -32603,
+	/** Server error (generic) */
+	ServerError: -32000,
+} as const;
+
+/**
+ * Base CDP error class with error code
+ */
+export class CDPError extends Error {
+	constructor(
+		message: string,
+		readonly code: number
+	) {
+		super(message);
+		this.name = 'CDPError';
+	}
+}
+
+/**
+ * Error thrown when a CDP method is not found
+ */
+export class CDPMethodNotFoundError extends CDPError {
+	constructor(method: string) {
+		super(`Method not found: ${method}`, CDPErrorCode.MethodNotFound);
+		this.name = 'CDPMethodNotFoundError';
+	}
+}
+
+/**
+ * Error thrown when CDP params are invalid
+ */
+export class CDPInvalidParamsError extends CDPError {
+	constructor(message: string) {
+		super(message, CDPErrorCode.InvalidParams);
+		this.name = 'CDPInvalidParamsError';
+	}
+}
+
+/**
+ * Error thrown for internal CDP errors
+ */
+export class CDPInternalError extends CDPError {
+	constructor(message: string) {
+		super(message, CDPErrorCode.InternalError);
+		this.name = 'CDPInternalError';
+	}
+}
+
+/**
+ * Error thrown for generic CDP server errors
+ */
+export class CDPServerError extends CDPError {
+	constructor(message: string) {
+		super(message, CDPErrorCode.ServerError);
+		this.name = 'CDPServerError';
+	}
+}
+
+/**
+ * CDP message types
+ */
+export interface CDPRequest {
+	id: number;
+	method: string;
+	params?: unknown;
+	sessionId?: string;
+}
+
+export interface CDPResponse {
+	id: number;
+	result?: unknown;
+	error?: { code: number; message: string };
+	sessionId?: string;
+}
+
+export interface CDPEvent {
+	method: string;
+	params: unknown;
+	sessionId?: string;
+}
+
+export interface CDPTargetInfo {
+	targetId: string;
+	type: string;
+	title: string;
+	url: string;
+	attached: boolean;
+	canAccessOpener: boolean;
+	browserContextId?: string;
+}
+
+export interface CDPBrowserVersion {
+	protocolVersion: string;
+	product: string;
+	revision: string;
+	userAgent: string;
+	jsVersion: string;
+}
+
+export interface CDPWindowBounds {
+	left: number;
+	top: number;
+	width: number;
+	height: number;
+	windowState: string;
+}
+
+/**
+ * A debuggable CDP target (e.g., a browser view).
+ * Targets can be attached to by CDP clients.
+ */
+export interface ICDPTarget {
+	/** Get target info for CDP protocol. Initializes the target if needed. */
+	getTargetInfo(): Promise<CDPTargetInfo>;
+	/** Attach to receive events and send commands. Initializes if needed. Dispose to detach. */
+	attach(): Promise<ICDPConnection>;
+}
+
+/**
+ * Service interface for managing CDP targets and browser contexts.
+ */
+export interface ICDPBrowserTarget extends ICDPTarget {
+	/** Event fired when a target is created */
+	readonly onTargetCreated: Event<ICDPTarget>;
+	/** Event fired when a target is about to be destroyed */
+	readonly onTargetDestroyed: Event<ICDPTarget>;
+
+	// Browser-level information
+	/** Get browser version info for CDP Browser.getVersion */
+	getVersion(): CDPBrowserVersion;
+	/** Get the window ID and bounds for a target */
+	getWindowForTarget(target: ICDPTarget): { windowId: number; bounds: CDPWindowBounds };
+
+	/** Get all available targets */
+	getTargets(): IterableIterator<ICDPTarget>;
+	/** Create a new target in the specified browser context */
+	createTarget(url: string, browserContextId?: string): Promise<ICDPTarget>;
+	/** Activate a target (bring to foreground) */
+	activateTarget(target: ICDPTarget): Promise<void>;
+	/** Close a target */
+	closeTarget(target: ICDPTarget): Promise<boolean>;
+
+	// Browser context management
+	/** Get all browser context IDs */
+	getBrowserContexts(): string[];
+	/** Create a new isolated browser context */
+	createBrowserContext(): Promise<string>;
+	/** Dispose a browser context and all its targets */
+	disposeBrowserContext(browserContextId: string): Promise<void>;
+}
+
+/**
+ * A bidirectional CDP connection that can send commands and receive events.
+ * Returned by ICDPTarget.attach() for low-level connections, and also
+ * implemented by CDPBrowserProxy for the full protocol-aware connection.
+ */
+export interface ICDPConnection extends IDisposable {
+	/** The session ID for this connection */
+	readonly sessionId: string;
+
+	/** Event fired when the connection receives a CDP event */
+	readonly onEvent: Event<CDPEvent>;
+	/** Event fired when the connection is closed */
+	readonly onClose: Event<void>;
+
+	/**
+	 * Send a CDP command and await the result.
+	 * @param method The CDP method to call
+	 * @param params Optional parameters for the method
+	 * @param sessionId Optional session ID for targeting a specific session
+	 * @returns Promise resolving to the result or rejecting with a CDPError
+	 */
+	sendMessage(method: string, params?: unknown, sessionId?: string): Promise<unknown>;
+}
diff --git a/src/vs/platform/browserView/electron-main/browserSession.ts b/src/vs/platform/browserView/electron-main/browserSession.ts
new file mode 100644
index 00000000000..04e70143188
--- /dev/null
+++ b/src/vs/platform/browserView/electron-main/browserSession.ts
@@ -0,0 +1,215 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { session } from 'electron';
+import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { joinPath } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { BrowserViewStorageScope } from '../common/browserView.js';
+
+// Same as webviews
+const allowedPermissions = new Set([
+	'pointerLock',
+	'notifications',
+	'clipboard-read',
+	'clipboard-sanitized-write'
+]);
+
+/**
+ * Holds an Electron session along with its storage scope and unique browser
+ * context identifier.  Each instance maps one-to-one to an Electron
+ * {@link Electron.Session} -- the {@link id} is derived from what makes the
+ * Electron session unique (scope + workspace), **not** from any view id.
+ * Multiple browser views may reference the same `BrowserSession`.
+ *
+ * The class centralises the permission configuration.  The {@link id}
+ * doubles as the CDP `browserContextId`.
+ *
+ * This class uses a private constructor with static factory methods
+ * ({@link getOrCreate}, {@link getOrCreateGlobal}, etc.) and maintains
+ * an internal registry of live sessions. Use the static methods to
+ * obtain instances.
+ */
+export class BrowserSession extends Disposable {
+
+	// #region Static registry
+
+	/**
+	 * All live sessions keyed by their unique id.
+	 *
+	 * ID derivation rules (one-to-one with Electron sessions):
+	 *  - Global scope         -> `"global"`
+	 *  - Workspace scope      -> `"workspace:${workspaceId}"`
+	 *  - Ephemeral scope      -> `"ephemeral:${viewId}"` or `"${type}:${viewId}"` for custom types
+	 */
+	private static readonly _sessions = new Map<string, BrowserSession>();
+
+	/**
+	 * Weak set mirroring the Electron sessions owned by any BrowserSession.
+	 * Useful for quickly checking whether a given {@link Electron.WebContents}
+	 * belongs to the integrated browser.
+	 */
+	static readonly knownSessions = new WeakSet<Electron.Session>();
+
+	/**
+	 * Check if a {@link Electron.WebContents} belongs to an integrated browser
+	 * view backed by a BrowserSession.
+	 */
+	static isBrowserViewWebContents(contents: Electron.WebContents): boolean {
+		return BrowserSession.knownSessions.has(contents.session);
+	}
+
+	/**
+	 * Return an existing session for the given id, or `undefined`.
+	 */
+	static get(id: string): BrowserSession | undefined {
+		return BrowserSession._sessions.get(id);
+	}
+
+	/**
+	 * Return all live browser context IDs (i.e. all session {@link id}s).
+	 */
+	static getBrowserContextIds(): string[] {
+		return [...BrowserSession._sessions.keys()];
+	}
+
+	/**
+	 * Get or create the singleton global-scope session.
+	 */
+	static getOrCreateGlobal(): BrowserSession {
+		const existing = BrowserSession._sessions.get('global');
+		if (existing) {
+			return existing;
+		}
+		return new BrowserSession('global', session.fromPartition('persist:vscode-browser'), BrowserViewStorageScope.Global);
+	}
+
+	/**
+	 * Get or create a workspace-scope session for the given workspace.
+	 */
+	static getOrCreateWorkspace(workspaceId: string, workspaceStorageHome: URI): BrowserSession {
+		const sessionId = `workspace:${workspaceId}`;
+		const existing = BrowserSession._sessions.get(sessionId);
+		if (existing) {
+			return existing;
+		}
+		const storage = joinPath(workspaceStorageHome, workspaceId, 'browserStorage');
+		return new BrowserSession(sessionId, session.fromPath(storage.fsPath), BrowserViewStorageScope.Workspace);
+	}
+
+	/**
+	 * Get or create an ephemeral session for the given view / target id.
+	 */
+	static getOrCreateEphemeral(viewId: string, type?: string): BrowserSession {
+		if (type === 'workspace' || type === 'ephemeral') {
+			throw new Error(`Cannot create session with reserved type '${type}'`);
+		}
+
+		const sessionId = `${type ?? 'ephemeral'}:${viewId}`;
+		const existing = BrowserSession._sessions.get(sessionId);
+		if (existing) {
+			return existing;
+		}
+		return new BrowserSession(sessionId, session.fromPartition(`vscode-browser-${type}${viewId}`), BrowserViewStorageScope.Ephemeral);
+	}
+
+	/**
+	 * Get or create a session for a workbench-originated browser view.
+	 * The session id is derived from the *scope* -- not the view id -- so
+	 * multiple views that share a scope (e.g. two Global views) get the
+	 * same `BrowserSession`.
+	 *
+	 * @param viewId   Used only for ephemeral sessions where every view
+	 *                 needs its own Electron session.
+	 * @param scope    Desired storage scope.
+	 * @param workspaceStorageHome  Root folder under which per-workspace
+	 *                              browser storage is created
+	 *                              (`IEnvironmentMainService.workspaceStorageHome`).
+	 * @param workspaceId  Only required when `scope` is `workspace`.
+	 */
+	static getOrCreate(
+		viewId: string,
+		scope: BrowserViewStorageScope,
+		workspaceStorageHome: URI,
+		workspaceId?: string,
+	): BrowserSession {
+		switch (scope) {
+			case BrowserViewStorageScope.Global:
+				return BrowserSession.getOrCreateGlobal();
+			case BrowserViewStorageScope.Workspace:
+				if (workspaceId) {
+					return BrowserSession.getOrCreateWorkspace(workspaceId, workspaceStorageHome);
+				}
+			// fallthrough -- no workspace context -> ephemeral
+			case BrowserViewStorageScope.Ephemeral:
+			default:
+				return BrowserSession.getOrCreateEphemeral(viewId);
+		}
+	}
+
+	// #endregion
+
+	// #region Instance
+
+	// Reference count how many browser views are currently using this session.
+	// When the count drops to zero, the session is removed from the registry.
+	private refs = 0;
+
+	private constructor(
+		/**
+		 * Unique identifier for this session.  Derived from what makes the
+		 * underlying Electron session unique (scope key, workspace id, view
+		 * id, or context uuid) -- NOT from any particular view id.
+		 */
+		readonly id: string,
+		/** The underlying Electron session. */
+		readonly electronSession: Electron.Session,
+		/** Resolved storage scope. */
+		readonly storageScope: BrowserViewStorageScope,
+	) {
+		super();
+
+		if (BrowserSession._sessions.has(id)) {
+			throw new Error(`BrowserSession with id '${id}' already exists`);
+		}
+
+		this.configureSession();
+		BrowserSession.knownSessions.add(electronSession);
+		BrowserSession._sessions.set(id, this);
+	}
+
+	/**
+	 * Apply the standard permission policy to the session.
+	 */
+	private configureSession(): void {
+		this.electronSession.setPermissionRequestHandler((_webContents, permission, callback) => {
+			return callback(allowedPermissions.has(permission));
+		});
+		this.electronSession.setPermissionCheckHandler((_webContents, permission, _origin) => {
+			return allowedPermissions.has(permission);
+		});
+	}
+
+	public acquire(): IDisposable {
+		this.refs++;
+		return toDisposable(() => {
+			this.refs--;
+			if (this.refs === 0) {
+				this.dispose();
+			}
+		});
+	}
+
+	override dispose(): void {
+		if (this.refs > 0) {
+			throw new Error(`Cannot dispose BrowserSession because it is still in use`);
+		}
+
+		BrowserSession._sessions.delete(this.id);
+		super.dispose();
+	}
+
+	// #endregion
+}
diff --git a/src/vs/platform/browserView/electron-main/browserView.ts b/src/vs/platform/browserView/electron-main/browserView.ts
index 3154da6ccb1..3d49bdf13ea 100644
--- a/src/vs/platform/browserView/electron-main/browserView.ts
+++ b/src/vs/platform/browserView/electron-main/browserView.ts
@@ -8,7 +8,7 @@ import { FileAccess } from '../../../base/common/network.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
-import { IBrowserViewBounds, IBrowserViewDevToolsStateEvent, IBrowserViewFocusEvent, IBrowserViewKeyDownEvent, IBrowserViewState, IBrowserViewNavigationEvent, IBrowserViewLoadingEvent, IBrowserViewLoadError, IBrowserViewTitleChangeEvent, IBrowserViewFaviconChangeEvent, IBrowserViewNewPageRequest, BrowserViewStorageScope, IBrowserViewCaptureScreenshotOptions, IBrowserViewFindInPageOptions, IBrowserViewFindInPageResult, IBrowserViewVisibilityEvent, BrowserNewPageLocation, browserViewIsolatedWorldId } from '../common/browserView.js';
+import { IBrowserViewBounds, IBrowserViewDevToolsStateEvent, IBrowserViewFocusEvent, IBrowserViewKeyDownEvent, IBrowserViewState, IBrowserViewNavigationEvent, IBrowserViewLoadingEvent, IBrowserViewLoadError, IBrowserViewTitleChangeEvent, IBrowserViewFaviconChangeEvent, IBrowserViewNewPageRequest, IBrowserViewCaptureScreenshotOptions, IBrowserViewFindInPageOptions, IBrowserViewFindInPageResult, IBrowserViewVisibilityEvent, BrowserNewPageLocation, browserViewIsolatedWorldId } from '../common/browserView.js';
 import { EVENT_KEY_CODE_MAP, KeyCode, KeyMod, SCAN_CODE_STR_TO_EVENT_KEY_CODE } from '../../../base/common/keyCodes.js';
 import { IWindowsMainService } from '../../windows/electron-main/windows.js';
 import { IBaseWindow, ICodeWindow } from '../../window/electron-main/window.js';
@@ -16,6 +16,10 @@ import { IAuxiliaryWindowsMainService } from '../../auxiliaryWindow/electron-mai
 import { IAuxiliaryWindow } from '../../auxiliaryWindow/electron-main/auxiliaryWindow.js';
 import { isMacintosh } from '../../../base/common/platform.js';
 import { BrowserViewUri } from '../common/browserViewUri.js';
+import { BrowserViewDebugger } from './browserViewDebugger.js';
+import { ILogService } from '../../log/common/log.js';
+import { ICDPTarget, ICDPConnection, CDPTargetInfo } from '../common/cdp/types.js';
+import { BrowserSession } from './browserSession.js';
 
 /** Key combinations that are used in system-level shortcuts. */
 const nativeShortcuts = new Set([
@@ -33,7 +37,7 @@ const nativeShortcuts = new Set([
  * Represents a single browser view instance with its WebContentsView and all associated logic.
  * This class encapsulates all operations and events for a single browser view.
  */
-export class BrowserView extends Disposable {
+export class BrowserView extends Disposable implements ICDPTarget {
 	private readonly _view: WebContentsView;
 	private readonly _faviconRequestCache = new Map<string, Promise<string>>();
 
@@ -42,8 +46,10 @@ export class BrowserView extends Disposable {
 	private _lastError: IBrowserViewLoadError | undefined = undefined;
 	private _lastUserGestureTimestamp: number = -Infinity;
 
+	private _debugger: BrowserViewDebugger;
 	private _window: IBaseWindow | undefined;
 	private _isSendingKeyEvent = false;
+	private _isDisposed = false;
 
 	private readonly _onDidNavigate = this._register(new Emitter<IBrowserViewNavigationEvent>());
 	readonly onDidNavigate: Event<IBrowserViewNavigationEvent> = this._onDidNavigate.event;
@@ -80,12 +86,12 @@ export class BrowserView extends Disposable {
 
 	constructor(
 		public readonly id: string,
-		private readonly viewSession: Electron.Session,
-		private readonly storageScope: BrowserViewStorageScope,
+		public readonly session: BrowserSession,
 		createChildView: (options?: Electron.WebContentsViewConstructorOptions) => BrowserView,
 		options: Electron.WebContentsViewConstructorOptions | undefined,
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
-		@IAuxiliaryWindowsMainService private readonly auxiliaryWindowsMainService: IAuxiliaryWindowsMainService
+		@IAuxiliaryWindowsMainService private readonly auxiliaryWindowsMainService: IAuxiliaryWindowsMainService,
+		@ILogService private readonly logService: ILogService
 	) {
 		super();
 
@@ -96,7 +102,7 @@ export class BrowserView extends Disposable {
 			contextIsolation: true,
 			sandbox: true,
 			webviewTag: false,
-			session: viewSession,
+			session: this.session.electronSession,
 			preload: FileAccess.asFileUri('vs/platform/browserView/electron-browser/preload-browserView.js').fsPath,
 
 			// TODO@kycutler: Remove this once https://github.com/electron/electron/issues/42578 is fixed
@@ -145,9 +151,13 @@ export class BrowserView extends Disposable {
 		});
 
 		this._view.webContents.on('destroyed', () => {
-			this._onDidClose.fire();
+			this.dispose();
 		});
 
+		this._debugger = new BrowserViewDebugger(this, this.logService);
+
+		this._register(session.acquire());
+
 		this.setupEventListeners();
 	}
 
@@ -351,7 +361,7 @@ export class BrowserView extends Disposable {
 			lastScreenshot: this._lastScreenshot,
 			lastFavicon: this._lastFavicon,
 			lastError: this._lastError,
-			storageScope: this.storageScope
+			storageScope: this.session.storageScope
 		};
 	}
 
@@ -558,7 +568,7 @@ export class BrowserView extends Disposable {
 	 * Clear all storage data for this browser view's session
 	 */
 	async clearStorage(): Promise<void> {
-		await this.viewSession.clearData();
+		await this.session.electronSession.clearData();
 	}
 
 	/**
@@ -568,12 +578,39 @@ export class BrowserView extends Disposable {
 		return this._view;
 	}
 
+	// ============ ICDPTarget implementation ============
+
+	/**
+	 * Get CDP target info using Electron's real targetId.
+	 */
+	getTargetInfo(): Promise<CDPTargetInfo> {
+		return this._debugger.getTargetInfo();
+	}
+
+	/**
+	 * Attach to receive debugger events.
+	 * @returns A connection that can be disposed to detach
+	 */
+	attach(): Promise<ICDPConnection> {
+		return this._debugger.attach();
+	}
+
 	override dispose(): void {
+		if (this._isDisposed) {
+			return;
+		}
+		this._isDisposed = true;
+
+		// Dispose debugger. This detaches debug sessions first.
+		this._debugger.dispose();
+
 		// Remove from parent window
 		this._window?.win?.contentView.removeChildView(this._view);
 
+		// Fire close event BEFORE disposing emitters. This signals the view has been destroyed.
+		this._onDidClose.fire();
+
 		// Clean up the view and all its event listeners
-		// Note: webContents.close() automatically removes all event listeners
 		this._view.webContents.close({ waitForBeforeUnload: false });
 
 		super.dispose();
diff --git a/src/vs/platform/browserView/electron-main/browserViewDebugger.ts b/src/vs/platform/browserView/electron-main/browserViewDebugger.ts
new file mode 100644
index 00000000000..e9956c91b18
--- /dev/null
+++ b/src/vs/platform/browserView/electron-main/browserViewDebugger.ts
@@ -0,0 +1,211 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { ILogService } from '../../log/common/log.js';
+import { CDPEvent, CDPTargetInfo, ICDPConnection, ICDPTarget } from '../common/cdp/types.js';
+import { BrowserView } from './browserView.js';
+
+/**
+ * Wraps a browser view's Electron debugger with per-client session management.
+ *
+ * Each client gets their own Electron debugger session, providing true isolation
+ * just like connecting multiple DevTools clients to a real Chrome instance.
+ */
+export class BrowserViewDebugger extends Disposable implements ICDPTarget {
+
+	/** Map from CDP sessionId to the per-connection event emitter */
+	private readonly _sessions = this._register(new DisposableMap<string, DebugSession>());
+
+	/**
+	 * The real CDP targetId discovered from Target.getTargets().
+	 * Ideally this could be fetched synchronously from the WebContents,
+	 * but in practice we need to query Electron's debugger API asynchronously to find it.
+	 */
+	private _realTargetId: string | undefined;
+	private _initializePromise: Promise<void> | undefined;
+	private readonly _messageHandler: (event: Electron.Event, method: string, params: unknown, sessionId?: string) => void;
+	private readonly _electronDebugger: Electron.Debugger;
+
+	constructor(
+		private readonly view: BrowserView,
+		private readonly logService: ILogService
+	) {
+		super();
+
+		this._electronDebugger = view.webContents.debugger;
+
+		// Set up message handler bound to this instance - note the sessionId parameter
+		this._messageHandler = (_event: Electron.Event, method: string, params: unknown, sessionId?: string) => {
+			this.routeCDPEvent(method, params, sessionId);
+		};
+	}
+
+	/**
+	 * Attach to this debugger.
+	 * Creates a dedicated CDP session and returns a connection.
+	 * Dispose the returned connection to detach.
+	 */
+	async attach(): Promise<ICDPConnection> {
+		// Ensure initialized
+		await this.initialize();
+
+		// Create a dedicated Electron session
+		const result = await this._electronDebugger.sendCommand('Target.attachToTarget', {
+			targetId: this._realTargetId,
+			flatten: true
+		}) as { sessionId: string };
+
+		const sessionId = result.sessionId;
+		const session = new DebugSession(sessionId, this._electronDebugger);
+		this._sessions.set(sessionId, session);
+		session.onClose(() => this._sessions.deleteAndDispose(sessionId));
+
+		return session;
+	}
+
+	/**
+	 * Get CDP target info.
+	 * Initializes the debugger if not already done.
+	 */
+	async getTargetInfo(): Promise<CDPTargetInfo> {
+		// Ensure initialized
+		await this.initialize();
+
+		const url = this.view.webContents.getURL() || 'about:blank';
+		const title = this.view.webContents.getTitle() || url;
+
+		return {
+			targetId: this._realTargetId!,
+			type: 'page',
+			title,
+			url,
+			attached: this._sessions.size > 0,
+			canAccessOpener: false,
+			browserContextId: this.view.session.id
+		};
+	}
+
+	/**
+	 * Initialize the debugger early to discover the real targetId.
+	 */
+	private initialize(): Promise<void> {
+		if (!this._initializePromise) {
+			this._initializePromise = (async () => {
+				this.attachElectronDebugger();
+				await this.discoverRealTargetId();
+
+				if (!this._realTargetId) {
+					this._initializePromise = undefined; // Allow retry on failure
+					throw new Error('Could not discover real targetId for this WebContents');
+				}
+			})();
+		}
+		return this._initializePromise;
+	}
+
+	/**
+	 * Discover the real targetId for this WebContents
+	 */
+	private async discoverRealTargetId(): Promise<void> {
+		try {
+			const result = await this._electronDebugger.sendCommand('Target.getTargetInfo') as { targetInfo: CDPTargetInfo };
+			this._realTargetId = result.targetInfo.targetId;
+		} catch (error) {
+			this.logService.error(`[BrowserViewDebugger] Error discovering real targetId:`, error);
+		}
+	}
+
+	/**
+	 * Attach to the Electron debugger
+	 */
+	private attachElectronDebugger(): void {
+		if (this._electronDebugger.isAttached()) {
+			return;
+		}
+
+		this._electronDebugger.attach('1.3');
+		this._electronDebugger.on('message', this._messageHandler);
+	}
+
+	/**
+	 * Route a CDP event to the correct connection by sessionId.
+	 * Fires on the per-connection session for the proxy to handle.
+	 */
+	private routeCDPEvent(method: string, params: unknown, sessionId?: string): void {
+		if (!sessionId) {
+			// Events without a sessionId are managed at a higher level, so we can ignore them here.
+			return;
+		}
+
+		// Find the session for this sessionId and fire the event
+		const session = this._sessions.get(sessionId);
+		if (session) {
+			session.emitEvent({ method, params, sessionId });
+		}
+	}
+
+	/**
+	 * Detach from the Electron debugger
+	 */
+	private detachElectronDebugger(): void {
+		if (!this._electronDebugger.isAttached()) {
+			return;
+		}
+
+		this._electronDebugger.removeListener('message', this._messageHandler);
+		try {
+			this._electronDebugger.detach();
+		} catch (error) {
+			this.logService.error(`[BrowserViewDebugger] Error detaching from WebContents:`, error);
+		}
+	}
+
+	override dispose(): void {
+		this.detachElectronDebugger();
+		super.dispose();
+	}
+}
+
+class DebugSession extends Disposable implements ICDPConnection {
+	private readonly _onEvent = this._register(new Emitter<CDPEvent>());
+	readonly onEvent = this._onEvent.event;
+	readonly emitEvent = (event: CDPEvent) => this._onEvent.fire(event);
+
+	private readonly _onClose = this._register(new Emitter<void>());
+	readonly onClose = this._onClose.event;
+
+	private _isDisposed = false;
+
+	constructor(
+		public readonly sessionId: string,
+		private readonly _electronDebugger: Electron.Debugger
+	) {
+		super();
+	}
+
+	async sendMessage(method: string, params?: unknown, _sessionId?: string): Promise<unknown> {
+		// This crashes Electron. Don't pass it through.
+		if (method === 'Emulation.setDeviceMetricsOverride') {
+			return Promise.resolve({});
+		}
+
+		return this._electronDebugger.sendCommand(method, params, this.sessionId);
+	}
+
+	override dispose(): void {
+		if (this._isDisposed) {
+			return;
+		}
+		this._isDisposed = true;
+
+		// Detach from the Electron session (fire and forget)
+		this._electronDebugger.sendCommand('Target.detachFromTarget', { sessionId: this.sessionId }).catch(() => { });
+
+		this._onClose.fire();
+		super.dispose();
+	}
+}
diff --git a/src/vs/platform/browserView/electron-main/browserViewMainService.ts b/src/vs/platform/browserView/electron-main/browserViewMainService.ts
index 7932a442087..34956252ade 100644
--- a/src/vs/platform/browserView/electron-main/browserViewMainService.ts
+++ b/src/vs/platform/browserView/electron-main/browserViewMainService.ts
@@ -3,85 +3,60 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { session } from 'electron';
+import { Emitter, Event } from '../../../base/common/event.js';
 import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
 import { IBrowserViewBounds, IBrowserViewKeyDownEvent, IBrowserViewState, IBrowserViewService, BrowserViewStorageScope, IBrowserViewCaptureScreenshotOptions, IBrowserViewFindInPageOptions } from '../common/browserView.js';
-import { joinPath } from '../../../base/common/resources.js';
+import { ICDPTarget, CDPBrowserVersion, CDPWindowBounds, CDPTargetInfo, ICDPConnection, ICDPBrowserTarget } from '../common/cdp/types.js';
 import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
 import { createDecorator, IInstantiationService } from '../../instantiation/common/instantiation.js';
 import { BrowserView } from './browserView.js';
 import { generateUuid } from '../../../base/common/uuid.js';
+import { BrowserViewUri } from '../common/browserViewUri.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
+import { BrowserSession } from './browserSession.js';
+import { IProductService } from '../../product/common/productService.js';
+import { CDPBrowserProxy } from '../common/cdp/proxy.js';
 
 export const IBrowserViewMainService = createDecorator<IBrowserViewMainService>('browserViewMainService');
 
-export interface IBrowserViewMainService extends IBrowserViewService {
+export interface IBrowserViewMainService extends IBrowserViewService, ICDPBrowserTarget {
 	tryGetBrowserView(id: string): BrowserView | undefined;
 }
 
-// Same as webviews
-const allowedPermissions = new Set([
-	'pointerLock',
-	'notifications',
-	'clipboard-read',
-	'clipboard-sanitized-write'
-]);
-
 export class BrowserViewMainService extends Disposable implements IBrowserViewMainService {
 	declare readonly _serviceBrand: undefined;
 
 	/**
-	 * Check if a webContents belongs to an integrated browser view
-	*/
-	private static readonly knownSessions = new WeakSet<Electron.Session>();
+	 * Check if a webContents belongs to an integrated browser view.
+	 * Delegates to {@link BrowserSession.isBrowserViewWebContents}.
+	 */
 	static isBrowserViewWebContents(contents: Electron.WebContents): boolean {
-		return BrowserViewMainService.knownSessions.has(contents.session);
+		return BrowserSession.isBrowserViewWebContents(contents);
 	}
 
 	private readonly browserViews = this._register(new DisposableMap<string, BrowserView>());
 
+	// ICDPBrowserTarget events
+	private readonly _onTargetCreated = this._register(new Emitter<BrowserView>());
+	readonly onTargetCreated: Event<BrowserView> = this._onTargetCreated.event;
+
+	private readonly _onTargetDestroyed = this._register(new Emitter<BrowserView>());
+	readonly onTargetDestroyed: Event<BrowserView> = this._onTargetDestroyed.event;
+
 	constructor(
 		@IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
+		@IProductService private readonly productService: IProductService
 	) {
 		super();
 	}
 
 	/**
-	 * Get the session for a browser view based on data storage setting and workspace
+	 * Create a browser view backed by the given {@link BrowserSession}.
 	 */
-	private getSession(requestedScope: BrowserViewStorageScope, viewId?: string, workspaceId?: string): {
-		session: Electron.Session;
-		resolvedScope: BrowserViewStorageScope;
-	} {
-		switch (requestedScope) {
-			case 'global':
-				return { session: session.fromPartition('persist:vscode-browser'), resolvedScope: BrowserViewStorageScope.Global };
-			case 'workspace':
-				if (workspaceId) {
-					const storage = joinPath(this.environmentMainService.workspaceStorageHome, workspaceId, 'browserStorage');
-					return { session: session.fromPath(storage.fsPath), resolvedScope: BrowserViewStorageScope.Workspace };
-				}
-			// fallthrough
-			case 'ephemeral':
-			default:
-				return { session: session.fromPartition(`vscode-browser-${viewId ?? generateUuid()}`), resolvedScope: BrowserViewStorageScope.Ephemeral };
-		}
-	}
-
-	private configureSession(viewSession: Electron.Session): void {
-		viewSession.setPermissionRequestHandler((_webContents, permission, callback) => {
-			return callback(allowedPermissions.has(permission));
-		});
-		viewSession.setPermissionCheckHandler((_webContents, permission, _origin) => {
-			return allowedPermissions.has(permission);
-		});
-	}
-
-	/**
-	 * Create a child browser view (used by window.open handler)
-	 */
-	private createBrowserView(id: string, session: Electron.Session, scope: BrowserViewStorageScope, options?: Electron.WebContentsViewConstructorOptions): BrowserView {
+	private createBrowserView(id: string, browserSession: BrowserSession, options?: Electron.WebContentsViewConstructorOptions): BrowserView {
 		if (this.browserViews.has(id)) {
 			throw new Error(`Browser view with id ${id} already exists`);
 		}
@@ -89,13 +64,19 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 		const view = this.instantiationService.createInstance(
 			BrowserView,
 			id,
-			session,
-			scope,
-			// Recursive factory for nested windows
-			(options) => this.createBrowserView(generateUuid(), session, scope, options),
+			browserSession,
+			// Recursive factory for nested windows (child views share the same session)
+			(childOptions) => this.createBrowserView(generateUuid(), browserSession, childOptions),
 			options
 		);
 		this.browserViews.set(id, view);
+
+		this._onTargetCreated.fire(view);
+		Event.once(view.onDidClose)(() => {
+			this._onTargetDestroyed.fire(view);
+			this.browserViews.deleteAndDispose(id);
+		});
+
 		return view;
 	}
 
@@ -107,12 +88,14 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 			return view.getState();
 		}
 
-		const { session, resolvedScope } = this.getSession(scope, id, workspaceId);
-		this.configureSession(session);
-		BrowserViewMainService.knownSessions.add(session);
-
-		const view = this.createBrowserView(id, session, resolvedScope);
+		const browserSession = BrowserSession.getOrCreate(
+			id,
+			scope,
+			this.environmentMainService.workspaceStorageHome,
+			workspaceId
+		);
 
+		const view = this.createBrowserView(id, browserSession);
 		return view.getState();
 	}
 
@@ -120,6 +103,119 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 		return this.browserViews.get(id);
 	}
 
+	// ICDPBrowserTarget implementation
+
+	getVersion(): CDPBrowserVersion {
+		return {
+			protocolVersion: '1.3',
+			product: `${this.productService.nameShort}/${this.productService.version}`,
+			revision: this.productService.commit || 'unknown',
+			userAgent: 'Electron',
+			jsVersion: process.versions.v8
+		};
+	}
+
+	getWindowForTarget(target: ICDPTarget): { windowId: number; bounds: CDPWindowBounds } {
+		if (!(target instanceof BrowserView)) {
+			throw new Error('Can only get window for targets created by this service');
+		}
+
+		const view = target.getWebContentsView();
+		const viewBounds = view.getBounds();
+		return {
+			windowId: 1,
+			bounds: {
+				left: viewBounds.x,
+				top: viewBounds.y,
+				width: viewBounds.width,
+				height: viewBounds.height,
+				windowState: 'normal'
+			}
+		};
+	}
+
+	async attach(): Promise<ICDPConnection> {
+		return new CDPBrowserProxy(this);
+	}
+
+	async getTargetInfo(): Promise<CDPTargetInfo> {
+		return {
+			targetId: 'browser',
+			type: 'browser',
+			title: this.getVersion().product,
+			url: '',
+			attached: true,
+			canAccessOpener: false
+		};
+	}
+
+	getTargets(): IterableIterator<BrowserView> {
+		return this.browserViews.values();
+	}
+
+	async createTarget(url: string, browserContextId?: string): Promise<ICDPTarget> {
+		const targetId = generateUuid();
+		const browserSession = browserContextId && BrowserSession.get(browserContextId) || BrowserSession.getOrCreateEphemeral(targetId);
+
+		// Create the browser view (fires onTargetCreated)
+		const view = this.createBrowserView(targetId, browserSession);
+
+		// Request the workbench to open the editor
+		this.windowsMainService.sendToFocused('vscode:runAction', {
+			id: 'vscode.open',
+			args: [BrowserViewUri.forUrl(url, targetId)]
+		});
+
+		return view;
+	}
+
+	async activateTarget(target: ICDPTarget): Promise<void> {
+		if (!(target instanceof BrowserView)) {
+			throw new Error('Can only activate targets created by this service');
+		}
+		// TODO@kycutler
+	}
+
+	async closeTarget(target: ICDPTarget): Promise<boolean> {
+		if (!(target instanceof BrowserView)) {
+			throw new Error('Can only close targets created by this service');
+		}
+
+		await this.destroyBrowserView(target.id);
+		return true;
+	}
+
+	// Browser context management
+
+	getBrowserContexts(): string[] {
+		return BrowserSession.getBrowserContextIds();
+	}
+
+	async createBrowserContext(): Promise<string> {
+		const browserSession = BrowserSession.getOrCreateEphemeral(generateUuid(), 'cdp-created');
+		return browserSession.id;
+	}
+
+	async disposeBrowserContext(browserContextId: string): Promise<void> {
+		if (!browserContextId.startsWith('cdp-created:')) {
+			throw new Error('Can only dispose browser contexts created via CDP');
+		}
+
+		const browserSession = BrowserSession.get(browserContextId);
+		if (!browserSession) {
+			throw new Error(`Browser context ${browserContextId} not found`);
+		}
+
+		// Close all targets in this context
+		for (const view of this.browserViews.values()) {
+			if (view.session === browserSession) {
+				await this.destroyBrowserView(view.id);
+			}
+		}
+
+		browserSession.dispose();
+	}
+
 	/**
 	 * Get a browser view or throw if not found
 	 */
@@ -176,7 +272,7 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 	}
 
 	async destroyBrowserView(id: string): Promise<void> {
-		this.browserViews.deleteAndDispose(id);
+		return this.browserViews.deleteAndDispose(id);
 	}
 
 	async layout(id: string, bounds: IBrowserViewBounds): Promise<void> {
@@ -252,18 +348,15 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 	}
 
 	async clearGlobalStorage(): Promise<void> {
-		const { session, resolvedScope } = this.getSession(BrowserViewStorageScope.Global);
-		if (resolvedScope !== BrowserViewStorageScope.Global) {
-			throw new Error('Failed to resolve global storage session');
-		}
-		await session.clearData();
+		const browserSession = BrowserSession.getOrCreateGlobal();
+		await browserSession.electronSession.clearData();
 	}
 
 	async clearWorkspaceStorage(workspaceId: string): Promise<void> {
-		const { session, resolvedScope } = this.getSession(BrowserViewStorageScope.Workspace, undefined, workspaceId);
-		if (resolvedScope !== BrowserViewStorageScope.Workspace) {
-			throw new Error('Failed to resolve workspace storage session');
-		}
-		await session.clearData();
+		const browserSession = BrowserSession.getOrCreateWorkspace(
+			workspaceId,
+			this.environmentMainService.workspaceStorageHome
+		);
+		await browserSession.electronSession.clearData();
 	}
 }

From 37cdd0eb438e9c6b6ce7c2132af856a9eaffa81f Mon Sep 17 00:00:00 2001
From: Matt Bierner <12821956+mjbvz@users.noreply.github.com>
Date: Thu, 12 Feb 2026 12:43:36 -0800
Subject: [PATCH 06/11] Fixing errors

---
 .../markdown-language-features/package-lock.json     | 12 ++++++------
 extensions/markdown-language-features/package.json   |  2 +-
 .../markdown-language-features/src/markdownEngine.ts |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 0ba6fbad391..7d8c47eabc9 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -25,7 +25,7 @@
       "devDependencies": {
         "@types/dompurify": "^3.0.5",
         "@types/lodash.throttle": "^4.1.9",
-        "@types/markdown-it": "14.1.0",
+        "@types/markdown-it": "^14.1.2",
         "@types/node": "22.x",
         "@types/picomatch": "^2.3.0",
         "@types/vscode-notebook-renderer": "^1.60.0",
@@ -195,14 +195,14 @@
       }
     },
     "node_modules/@types/markdown-it": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.0.tgz",
-      "integrity": "sha512-B/o5iMXxpIAl1+792pO4ryhrNNiAus9HhrTs+Gt2m+6SIdEUEvyOIs0iqDNjTSRgbelWvyeek3UxfYYOKDaWfA==",
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/linkify-it": "*",
-        "@types/mdurl": "*"
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
       }
     },
     "node_modules/@types/mdurl": {
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 9f89c72836e..c242dceffd8 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -789,7 +789,7 @@
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
     "@types/lodash.throttle": "^4.1.9",
-    "@types/markdown-it": "14.1.0",
+    "@types/markdown-it": "^14.1.2",
     "@types/node": "22.x",
     "@types/picomatch": "^2.3.0",
     "@types/vscode-notebook-renderer": "^1.60.0",
diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts
index 8e10d72c730..0f4c7eb6717 100644
--- a/extensions/markdown-language-features/src/markdownEngine.ts
+++ b/extensions/markdown-language-features/src/markdownEngine.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type MarkdownIt = require('markdown-it');
+import type MarkdownIt from 'markdown-it';
 import * as vscode from 'vscode';
 import { ILogger } from './logging';
 import { MarkdownContributionProvider } from './markdownExtensions';

From b5f3937f1211ce4b8ee7f614645b88a6464a9cb0 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Thu, 12 Feb 2026 12:53:27 -0800
Subject: [PATCH 07/11] chore: onboard onto new sysroot (#294988)

---
 build/.cachesalt                      |  2 +-
 build/checksums/vscode-sysroot.txt    | 14 +++++++-------
 build/linux/debian/install-sysroot.ts |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/.cachesalt b/build/.cachesalt
index a90b8e833cb..39592260ad9 100644
--- a/build/.cachesalt
+++ b/build/.cachesalt
@@ -1 +1 @@
-2026-01-23T20:55:53.631Z
+2026-02-12T17:41:36.946Z
diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt
index 5744a5f77d4..847383e7a1a 100644
--- a/build/checksums/vscode-sysroot.txt
+++ b/build/checksums/vscode-sysroot.txt
@@ -1,7 +1,7 @@
-3baac81a39b69e0929e4700f4f78f022adefc515010054ec393565657c4fff32  aarch64-linux-gnu-glibc-2.28-gcc-10.5.0.tar.gz
-b4fb7a62ee7a474cfb11d5fb2b73accd6a8c875a559db81d6dfccd0b4a3da442  aarch64-linux-gnu-glibc-2.28-gcc-8.5.0.tar.gz
-633e88658561ab4643bc5998c88e565a26553b0e97fd07672cb452afb4d9b276  aarch64-linux-musl-gcc-10.3.0.tar.gz
-6e251200607ac4c4709ebd08b2dc0d9a353ddcfdb47f43a10c2b4cc4b49920c0  arm-rpi-linux-gnueabihf-glibc-2.28-gcc-10.5.0.tar.gz
-f82c8dacbb9dd85819e4801909eb4e842ac12c899632aa75b4839383a18c7501  arm-rpi-linux-gnueabihf-glibc-2.28-gcc-8.5.0.tar.gz
-3122af49c493c5c767c2b0772a41119cbdc9803125a705683445b4066dc88b82  x86_64-linux-gnu-glibc-2.28-gcc-10.5.0.tar.gz
-84acc5a15566c98ddf80631731d672e0ce9febcf3f2e969101e0dfd7ef2405e3  x86_64-linux-gnu-glibc-2.28-gcc-8.5.0.tar.gz
+38fa5acc4e4f17cb7e3f599b5226a511b22cbdceeb38277d224b45f7280f518f  aarch64-linux-gnu-glibc-2.28-gcc-10.5.0.tar.gz
+bcff71257397f76a4f7a76bbcfc425b4b60b16449e10b01a2cfce574c21d60da  aarch64-linux-gnu-glibc-2.28-gcc-8.5.0.tar.gz
+58cd59ee4038291fe8a7f4adccac0ecbe8d23cbad1cb650b381e45e7e1e22424  aarch64-linux-musl-gcc-10.3.0.tar.gz
+a0a1573e93191ae5e3735eb6107f4daeb4be7f99c5af229114d990ac77db33eb  arm-rpi-linux-gnueabihf-glibc-2.28-gcc-10.5.0.tar.gz
+375ecbb95c7eed95d6c7918af3c4418f2907e92e2f8d1b827a65bf46a8bbfc74  arm-rpi-linux-gnueabihf-glibc-2.28-gcc-8.5.0.tar.gz
+ac4b6b14b4cec027a22a51bbbb049b3504958a78106c8a8d5cec144206b767d1  x86_64-linux-gnu-glibc-2.28-gcc-10.5.0.tar.gz
+1ebb6ef1fe2983269fd0855a88f9c9a37f9b515d16524a9146198e4cabdf34f7  x86_64-linux-gnu-glibc-2.28-gcc-8.5.0.tar.gz
diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
index 2cab657c1b7..0dfc69a05a7 100644
--- a/build/linux/debian/install-sysroot.ts
+++ b/build/linux/debian/install-sysroot.ts
@@ -78,7 +78,7 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000)
 	try {
 		const controller = new AbortController();
 		const timeout = setTimeout(() => controller.abort(), 30 * 1000);
-		const version = '20250407-330404';
+		const version = '20260212-405735';
 		try {
 			const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
 				headers: ghApiHeaders,
@@ -229,7 +229,7 @@ export async function getChromiumSysroot(arch: DebianArchString): Promise<string
 	}
 	const sha = getSha(tarball);
 	if (sha !== tarballSha) {
-		throw new Error(`Tarball sha1sum is wrong. Expected ${tarballSha}, actual ${sha}`);
+		throw new Error(`Tarball checksum is wrong. Expected ${tarballSha}, actual ${sha}`);
 	}
 
 	const proc = spawnSync('tar', ['xf', tarball, '-C', sysroot]);

From 27ea56f796c23290a6939f025d0bf3a53e029f87 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Fri, 13 Feb 2026 06:11:08 +0900
Subject: [PATCH 08/11] chore: bump electron@39.5.2 (#294238)

* chore: bump electron@39.5.2

* chore: update checksums

* chore: undo bits on macOS

* chore: update lockfile

* chore: update node.js build

* chore: bump distro
---
 .npmrc                       |   4 +-
 .nvmrc                       |   2 +-
 build/checksums/electron.txt | 150 +++++++++++++++++------------------
 build/checksums/nodejs.txt   |  14 ++--
 build/gulpfile.vscode.ts     |   2 +-
 cgmanifest.json              |  12 +--
 package-lock.json            |   8 +-
 package.json                 |   4 +-
 remote/.npmrc                |   4 +-
 src/main.ts                  |   4 -
 10 files changed, 100 insertions(+), 104 deletions(-)

diff --git a/.npmrc b/.npmrc
index abbc265436f..97baacfce6f 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="39.3.0"
-ms_build_id="13168319"
+target="39.5.2"
+ms_build_id="13298971"
 runtime="electron"
 ignore-scripts=false
 build_from_source="true"
diff --git a/.nvmrc b/.nvmrc
index 5767036af0e..85e502778f6 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.21.1
+22.22.0
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index 4cebc1a16bd..68a137efaa2 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,75 +1,75 @@
-3d5ef8b78ce4f35320a76a241bbc67f7a1922cedbfe338de111e5fd617677ca8 *chromedriver-v39.3.0-darwin-arm64.zip
-ed1951ecc55949c65452e1f8cd29b2348c8fd7932c2b1e11279987525b4658bc *chromedriver-v39.3.0-darwin-x64.zip
-e0f1fa67b9f1ba8f15b2fc0aa0570e80d68261286a19862638a4f26c6966ecf2 *chromedriver-v39.3.0-linux-arm64.zip
-8a4f46da6a51c97e3296c13aa480a7714e7bd5e8fa46876526ece89c8ae5b182 *chromedriver-v39.3.0-linux-armv7l.zip
-44e15ac6c421e7bc7b36c55721085e5ccd4996c0770785dc78c55baaf4f73322 *chromedriver-v39.3.0-linux-x64.zip
-9cef14d9e758f697a4fc32047ae115ac3b43674075eade59c6e57d655f3d3850 *chromedriver-v39.3.0-mas-arm64.zip
-7de66aecd14699f331604820742f61201759d7d144b03254de420d8186fc098d *chromedriver-v39.3.0-mas-x64.zip
-c5821d83fe3c301399c7d8363fdda006fdb708c1ba382f294580f70612c4299e *chromedriver-v39.3.0-win32-arm64.zip
-21b810154777168f9dc571b68f4682ccf5c1ae20192b625ca1b25a9d84b00bf5 *chromedriver-v39.3.0-win32-ia32.zip
-232b2d1ebfcf7c4a9e2ad0f6d2cce189ef123d2bc875ee761f819658d0f56a57 *chromedriver-v39.3.0-win32-x64.zip
-49337014dfd1da81d62b4ee2a111f552a74795357cf10ba62c563fcba311523e *electron-api.json
-9486acdcf73a0d0e0655abb8aed6d5abd9685c15096184ecf6c3aa95d1aca9e6 *electron-v39.3.0-darwin-arm64-dsym-snapshot.zip
-e536221ba1d408173676a33b622dc3606c1db8d1d0bb4d30e1effbb2860cb7c2 *electron-v39.3.0-darwin-arm64-dsym.zip
-14cdbd45c3fe9649402bee3908b091075a0c89d9242544ce6a2d5e60714e97f9 *electron-v39.3.0-darwin-arm64-symbols.zip
-064edf951e0ab546809e217a417401023fd7e3b662de8be0316e8173f6f3db6d *electron-v39.3.0-darwin-arm64.zip
-451d63cee049b31a73c3fc221fac5d9007fd4566a09beb30b5f5c71d6e4dc9aa *electron-v39.3.0-darwin-x64-dsym-snapshot.zip
-61def766f6ff4ccb826e534b45b8b011f40b9bc3c10a70e4efcfdfb28b44546b *electron-v39.3.0-darwin-x64-dsym.zip
-6e8ef61fae54a3ac829dbdf193d2d8f98f87d07fe490e4fa0297328210a775a8 *electron-v39.3.0-darwin-x64-symbols.zip
-484c7f39235ea6c2c87b2ce5149436daa4eec97c9a6b11dc662f01ec1b81969e *electron-v39.3.0-darwin-x64.zip
-755f67294f8fe02af53f34cb2a0c9308675ecea21f7c07044bd9794212ae1e25 *electron-v39.3.0-linux-arm64-debug.zip
-abc44b6fc71ea483a1ac40a6dc6647d13c096810d9efb4f0bded96c2374ef931 *electron-v39.3.0-linux-arm64-symbols.zip
-468d3096630953a52fc051abd48714004b58ac550f9c7e798c256c774811b0f2 *electron-v39.3.0-linux-arm64.zip
-0481b5cb89883a4964d8b69dcbfe028d2cc4334e286d3c1b50629fa68373b8e3 *electron-v39.3.0-linux-armv7l-debug.zip
-a6250c680625e52c4f25b52f1c5e4927a736d7b628317b3981cc8f20db30abdf *electron-v39.3.0-linux-armv7l-symbols.zip
-37a889a488e7a64d86961ad774f20e3cbb5dd965d76a6efd98c83488c33964e0 *electron-v39.3.0-linux-armv7l.zip
-001f269f544a745df1f426891d3b46a9d4cfdf4c09564aab5a0d34ed447b2b86 *electron-v39.3.0-linux-x64-debug.zip
-cc3eb13935c3defbb1e6a9f9b92d2ee5c28d7a4cd6095f7ffa7cc8f124682df1 *electron-v39.3.0-linux-x64-symbols.zip
-a676357322bdf28153ba3ad67e8558dd54d76757fe2b1ad48c53f4a5e20614c6 *electron-v39.3.0-linux-x64.zip
-04c05cac5e957787b4890a5c24e1c2028e84058a6e0a0cb2b1737793d6aeee9a *electron-v39.3.0-mas-arm64-dsym-snapshot.zip
-b8cbf72450cf031a95d6157c3519371c02dbba13cabff2e07778c70eaed30edc *electron-v39.3.0-mas-arm64-dsym.zip
-7a2080fa0a3f46495761dc8b1d428756b0f50e8db4ded7db162a2d6cee2f64a0 *electron-v39.3.0-mas-arm64-symbols.zip
-c0c7a4454267bcefd94d002a78e846a9f5b50c85d8b5e32700cea03a7418d7b9 *electron-v39.3.0-mas-arm64.zip
-ddf14a1f735b6404c5b67666d7d79f707fbd3192fa98c05eac2ac8044dbb30ac *electron-v39.3.0-mas-x64-dsym-snapshot.zip
-c0cd9afa7e40e3faf5b2944025876fd6d6b40ecd4b72542e0a792cc5139e854d *electron-v39.3.0-mas-x64-dsym.zip
-f30ded8f8392ce8369aa8b1abfa98bd07a6c40b5eb114ec68c25f653242c8f1a *electron-v39.3.0-mas-x64-symbols.zip
-d38a8a0d21f4c97a41086ce8bee96b18f980e86585e942067e79f7bfcb26b57f *electron-v39.3.0-mas-x64.zip
-d4f5cb793e19c2c1ce0753307e02ca5a9a61f8c00244a0f9c56651df29a10c9b *electron-v39.3.0-win32-arm64-pdb.zip
-4683273c81fda42bba609dd240a252ce4c20bd99e56bad89c35f6bd46cdeb212 *electron-v39.3.0-win32-arm64-symbols.zip
-ed66f333ff7b385b2f40845178dc2dc4f25cc887510d766433392733fdd272a3 *electron-v39.3.0-win32-arm64-toolchain-profile.zip
-31fa0ab2c9a10654e9659badc838281ea9e403c08638cedd508dfa5c75b9ee04 *electron-v39.3.0-win32-arm64.zip
-689dbac4dcbfbbf01469b31f213bdeadc5b3af44103ebf81a19167e93c912730 *electron-v39.3.0-win32-ia32-pdb.zip
-6f7cdea2b2b0166d77149b458776e39880237a7d63f7f3cb9782aec86d50b3aa *electron-v39.3.0-win32-ia32-symbols.zip
-ed66f333ff7b385b2f40845178dc2dc4f25cc887510d766433392733fdd272a3 *electron-v39.3.0-win32-ia32-toolchain-profile.zip
-e8650adc82b2c32624428754d971f498c605de48c9aca74206f71506c3444c88 *electron-v39.3.0-win32-ia32.zip
-cc4cb73f613408a760570fac04a04d9c941966ec07561ab8d61200af91a0a7fc *electron-v39.3.0-win32-x64-pdb.zip
-ba837de8e030ed4aa3bff16bf4ac4aac02fc58872bbb1d690c3f525066ad27c0 *electron-v39.3.0-win32-x64-symbols.zip
-ed66f333ff7b385b2f40845178dc2dc4f25cc887510d766433392733fdd272a3 *electron-v39.3.0-win32-x64-toolchain-profile.zip
-6f7c3ddaba8d7d829f8ec259a8549c5e8f41d1b6d77bcb1c94ce5f4f85922158 *electron-v39.3.0-win32-x64.zip
-d23b65eaafa9aaa3b452fddf2d1f3c060bef3c5f2171ec48c1d149e0589c6997 *electron.d.ts
-27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.3.0-darwin-arm64.zip
-321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.3.0-darwin-x64.zip
-52ae6eccbdb4a9403a6c3eb46b356a28940ec25958b6b9181fb2f38e612e40ed *ffmpeg-v39.3.0-linux-arm64.zip
-622cb781fb1e3b9617e7e60c36384427f7b0d9b5ad888e9bc356a83b050e13f1 *ffmpeg-v39.3.0-linux-armv7l.zip
-ba441851788008362f013bf2983b22b0042af8df31bf90123328f928cc067492 *ffmpeg-v39.3.0-linux-x64.zip
-27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.3.0-mas-arm64.zip
-321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.3.0-mas-x64.zip
-eeb6919ce2218d1ead2cb565aab1b192244e86d7444eee94c10fcd92074d0b9c *ffmpeg-v39.3.0-win32-arm64.zip
-ab82eec0cb820ff0c29b80401dd168780cde80c00ed3ed0551910f94758b5ece *ffmpeg-v39.3.0-win32-ia32.zip
-0eefb7877ed0205b9f7d82bd97d8dd50c1b25e8559af38fff263582801126ea6 *ffmpeg-v39.3.0-win32-x64.zip
-ea022d26bd2a83c69e45c3d63a8658aeb707d6ba5a1cc57079f430ca6511c76f *hunspell_dictionaries.zip
-8b334785a1c0bcfe011871af3346a5059e7ed3726d3f38900b2f8213fd31fd8f *libcxx-objects-v39.3.0-linux-arm64.zip
-471b647164fa385a01b4fc8f49e965b8d3cc47e707eb0d7cafd4423b644cf0af *libcxx-objects-v39.3.0-linux-armv7l.zip
-02d84914526debacae40d82c06f55655c7297cd925edf96de642cf9b8a4681e8 *libcxx-objects-v39.3.0-linux-x64.zip
-377f4549aaeb154d68fb8a07a55cee6d6e188db028df3cca3e0b15557f6e4dc4 *libcxx_headers.zip
-06659d8c13cf63ef52ee06be71be0e4d83612c577539f630c97274cbe1ec9ad2 *libcxxabi_headers.zip
-2245e51837bb0e8b1a2acca1a43021c92d5d966e16d6cef7207adef2a00031a6 *mksnapshot-v39.3.0-darwin-arm64.zip
-eaf4f47036704f0d742a4e5fd864f1eb30ace16afbcc289ba535d4cde075c05f *mksnapshot-v39.3.0-darwin-x64.zip
-e94b20999118d812c63633d1988cb0c34798616195db2b0002d589f74c44347c *mksnapshot-v39.3.0-linux-arm64-x64.zip
-8b1e0b65fd19f3682f3cd194c3a58ba084ac2b6c0daa9a5c8f30eb8ac58bf7d1 *mksnapshot-v39.3.0-linux-armv7l-x64.zip
-2695157678a126eb58dde6575c2d1076755d6d03d3952cf0be91acf034a3f636 *mksnapshot-v39.3.0-linux-x64.zip
-bed97fce94eb42d5f3fa1b5f76da3cfea464df62a9ce0465e5e49e9e8a06fe15 *mksnapshot-v39.3.0-mas-arm64.zip
-d60038daff4a9e2f932738ef32c4b989953f6d3f2cc167adf14570fe2e6d5b08 *mksnapshot-v39.3.0-mas-x64.zip
-10267f4198cc94fc165b63ee9d92946f94e9d13069f96d33c099a73fefdcadae *mksnapshot-v39.3.0-win32-arm64-x64.zip
-0494944e5349d20b56f64ac9b11c2c3df56828dcfdf7cffe9a3413ef1d66ce92 *mksnapshot-v39.3.0-win32-ia32.zip
-0b6fbe361ddd170fbffe8f7ed32b3e79e78886f2402edb5b18c9cc5b3167cbd0 *mksnapshot-v39.3.0-win32-x64.zip
+a87acdd1cb412151f71c25154dccdf26744b80471acbef03dd20cfea2e0bd2d1 *chromedriver-v39.5.2-darwin-arm64.zip
+2181b4bfb4c9e543013bd08e0d6d1e1b3b80a7d99e1589a7e75089760d1d46c2 *chromedriver-v39.5.2-darwin-x64.zip
+f18c47c5544f158eaa1a3705bbcaab7a879c1829926310ebfd876749393ed2a0 *chromedriver-v39.5.2-linux-arm64.zip
+74435311880444074e0fedd2a52ecdf9a18f13689e9da700f6fae4c5b553e4d5 *chromedriver-v39.5.2-linux-armv7l.zip
+dd240f331c4ae2dd8e83aa517bc17a107f0747d62bb4321901c18ad4e48d8ea6 *chromedriver-v39.5.2-linux-x64.zip
+fa02c2e7f7b37b0944f796297545227e65b0ed09914b30a7469560db631e0b92 *chromedriver-v39.5.2-mas-arm64.zip
+b74448c03567849ec9226ddcb66b4c6f538608e73adc02fe52bdac740ecd8836 *chromedriver-v39.5.2-mas-x64.zip
+e8677c94445aaf9093b2dcdcaca6d95502001986cf2def6831f27d821997783e *chromedriver-v39.5.2-win32-arm64.zip
+7151dfd5c39e2e9e974e2039916d27250b9d6e4f9acbc77abd8a3957c64a5e73 *chromedriver-v39.5.2-win32-ia32.zip
+3cc66a7d98d67835b01c6732ad5f6083a30d8d91c6256dd1b1b6aee89df3b07e *chromedriver-v39.5.2-win32-x64.zip
+ed614289f57a5240db7c6ae20725468f4ffaaddd9d2a3472db2637af7cf73c52 *electron-api.json
+f6a4d5f3f66b200aa71ea10526ad6a0963d6595f90121cea148a93312d1e9478 *electron-v39.5.2-darwin-arm64-dsym-snapshot.zip
+885cec937ece1e1b975e3b21ad01481e6fea89906a83fc88ff303fb8e5111117 *electron-v39.5.2-darwin-arm64-dsym.zip
+9425e8286707e6c3cc280e8d415c9f1d7655e59c2e5c9e43866285a81cf8e5cf *electron-v39.5.2-darwin-arm64-symbols.zip
+618ada5c3ea7fdd3b2405d6e2b62c895d6531b9b0e12120e26a2e20e58d68e67 *electron-v39.5.2-darwin-arm64.zip
+4e311c4f48aed9d9c21ef99f39a70ce77bda85c7a419f604fc02c278b8d3f30f *electron-v39.5.2-darwin-x64-dsym-snapshot.zip
+55e4be9743fb9269161db3c6a57b2684d2d47f65d945fd03958fec58e7d081b5 *electron-v39.5.2-darwin-x64-dsym.zip
+8705af037514b7fd336ea90ef8990acbc5cce7d16f02925fd77e7f1b30ab0e5a *electron-v39.5.2-darwin-x64-symbols.zip
+5f51d106849b2afaa0a233f487485f0a484ac9dcb57c432feb6ae2731ed5cdfd *electron-v39.5.2-darwin-x64.zip
+829f10fad95dee51c74b221ab2569fea39102e27f2a00647bf04da6e8a90d386 *electron-v39.5.2-linux-arm64-debug.zip
+bd88a964bde7aec2490e599c32d8a872653a80fa07ae06f89b8b68bebb4a678b *electron-v39.5.2-linux-arm64-symbols.zip
+c1ed7b797fa534931b36cdd6a69ea6ed5de351d5cc4086aa155a8ed92fb518ed *electron-v39.5.2-linux-arm64.zip
+de56f65b0d9543a92230b9484de58797602a6008625d429415bc8221cf45525f *electron-v39.5.2-linux-armv7l-debug.zip
+dd6cecefe3fa2dd4ff8c97595bcb962814c92c989ae0a70dae73479709c5fe63 *electron-v39.5.2-linux-armv7l-symbols.zip
+0aefd0e66439ea4eb3db3e57742ca88988bb8d694eaa9c7d332c733c373ee32d *electron-v39.5.2-linux-armv7l.zip
+3c70967c5ec60a5bd3feba64052276e6920d659af87e994fc3b908e21cd93d33 *electron-v39.5.2-linux-x64-debug.zip
+51a567542bc8556ef82bfc7d3de4badb44ddbf8f240e4482be77eb30e95ad67b *electron-v39.5.2-linux-x64-symbols.zip
+1fddb169ed3a342ddaff1807c82c388966dbf4697349dd4902f2987152257337 *electron-v39.5.2-linux-x64.zip
+84d32cbf59f3fd2fc8d83c0dbe66b08b3a5f408f229066a2a4e71db5194e69c2 *electron-v39.5.2-mas-arm64-dsym-snapshot.zip
+f3a2701498c4b1ae3d59105225b4ba2b9a0fb0725d5f0591049462e643b63822 *electron-v39.5.2-mas-arm64-dsym.zip
+32ebb3e5a653f2042697fb411b4e4d52fdbd2af959472aa8b51e79420fbf9c78 *electron-v39.5.2-mas-arm64-symbols.zip
+92b9d5f559aed75931c744dd2c5a7124befe6c5d12e4cb777586107412375a11 *electron-v39.5.2-mas-arm64.zip
+1fc599b7efa4017d441c68795df78d6d83ff952aee42efe5de2d3eb1c964d240 *electron-v39.5.2-mas-x64-dsym-snapshot.zip
+af86806db4e0ee81e6949560d8a98ed56dbaf88698a7b9d15a30c64be05909f7 *electron-v39.5.2-mas-x64-dsym.zip
+1f81e8e29125f5f693eb3b1cec18ee16487123319add8d19f3f0327d1b16a8f6 *electron-v39.5.2-mas-x64-symbols.zip
+6d14692b43d0525f7fc1ce33485e586d1f1d6de68c2e7f4304917beea84bf576 *electron-v39.5.2-mas-x64.zip
+287fbc58d5635423e5762f37f551d039d4aebcf14b3ef58d27da67a8f448d344 *electron-v39.5.2-win32-arm64-pdb.zip
+6af15c530a187075418ff095c946f3fdb7b45709f402a61e7f9c93bc094f6bc7 *electron-v39.5.2-win32-arm64-symbols.zip
+efec460f92ff99a9d5970dd7a67fd0be5272989cfacc9389dec954c706b23f7d *electron-v39.5.2-win32-arm64-toolchain-profile.zip
+13db5c25d118485e8edc6ecaa9b239a57403e728db1a085de9441b35543f398b *electron-v39.5.2-win32-arm64.zip
+83fe5123b5810ee624ee5717d1466612a8b378a79c789f8963ac5d314efbc8d2 *electron-v39.5.2-win32-ia32-pdb.zip
+1abf6ac223b42e755486248218b91ebc5a8d862cea9c0bafe8abeca7c0cfce2e *electron-v39.5.2-win32-ia32-symbols.zip
+efec460f92ff99a9d5970dd7a67fd0be5272989cfacc9389dec954c706b23f7d *electron-v39.5.2-win32-ia32-toolchain-profile.zip
+9a5026091de20d4959b941ba594353ee5e8c7d7b542e5e729525d73c5cb67458 *electron-v39.5.2-win32-ia32.zip
+b36c477788cc258f14faf9dd35a16d46512605e0378305ecbab8f587d16ca985 *electron-v39.5.2-win32-x64-pdb.zip
+eba02395e7c3e6e508747800e36e529c000a6087f3f62a9c7a52328b3d91f378 *electron-v39.5.2-win32-x64-symbols.zip
+efec460f92ff99a9d5970dd7a67fd0be5272989cfacc9389dec954c706b23f7d *electron-v39.5.2-win32-x64-toolchain-profile.zip
+f3658e4e9eb7585f9646db2469f6d4c30837bd524013ef677bd305cc90f4fb11 *electron-v39.5.2-win32-x64.zip
+78d7e90d7dc1f753868011256075afcd24cbac74971f30d769105cff516f49fb *electron.d.ts
+27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.5.2-darwin-arm64.zip
+321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.5.2-darwin-x64.zip
+52ae6eccbdb4a9403a6c3eb46b356a28940ec25958b6b9181fb2f38e612e40ed *ffmpeg-v39.5.2-linux-arm64.zip
+622cb781fb1e3b9617e7e60c36384427f7b0d9b5ad888e9bc356a83b050e13f1 *ffmpeg-v39.5.2-linux-armv7l.zip
+ba441851788008362f013bf2983b22b0042af8df31bf90123328f928cc067492 *ffmpeg-v39.5.2-linux-x64.zip
+27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.5.2-mas-arm64.zip
+321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.5.2-mas-x64.zip
+6aabdb0f00966fb37d41a5ab193b0fdabb32a9556eae3c847ea22b946cd67f0d *ffmpeg-v39.5.2-win32-arm64.zip
+b3af48c3fdbccc0e0d97abd569892eaf871a844c7308de8a583ea8e7541491d2 *ffmpeg-v39.5.2-win32-ia32.zip
+8b53aae4bc3ae924e6d9e4b006708b53a335e7853c44db24ef49c982ab35acd4 *ffmpeg-v39.5.2-win32-x64.zip
+cc48430bbe7690d7e8117b10edaf34587ef664012f04152158aa1c75852737dc *hunspell_dictionaries.zip
+3c365db75791b6c6273d9b182698966194e0a1706286e1114c5846972efa92e9 *libcxx-objects-v39.5.2-linux-arm64.zip
+e674701d184288a61d2fa4920ef3c9cd9ceac1e5b8df87694c3db6599abc02bc *libcxx-objects-v39.5.2-linux-armv7l.zip
+998552c78147aeac569c1e7a5cb3fda94f6f6690aca105198280a28c7feb662b *libcxx-objects-v39.5.2-linux-x64.zip
+8082c0d7d5f00631e57139a4dddfbfd9bfe80656abf78737fc3f5e729bd110e5 *libcxx_headers.zip
+edf24979ef27199ad5cd9de9b52a56ef9bad022c7d9daff59c81a873bf0185cc *libcxxabi_headers.zip
+9dafc93aa576649d79d7df97c21d1644783c3a522d2cef3f7a484f7b02e67d9c *mksnapshot-v39.5.2-darwin-arm64.zip
+924fafb200efd7375cedd83e25202309229afe19e1df6efc4e2c8a1f344f1510 *mksnapshot-v39.5.2-darwin-x64.zip
+274ed43bbe1af8cd822ad13bfc670ada8ff9b0a604b25e13b0aa26f4e519099d *mksnapshot-v39.5.2-linux-arm64-x64.zip
+0a741013de490fb53fb230e812ae332dc9cebc93614c340abe5c427acae124bb *mksnapshot-v39.5.2-linux-armv7l-x64.zip
+ce12c4dea98046cbe39cf1393983e34784f5d7722fd920f01ea59697fc192cc3 *mksnapshot-v39.5.2-linux-x64.zip
+bdd5d316d30605d93527473d343fd4f7661ebaa415d07342be3d7450a9e46ade *mksnapshot-v39.5.2-mas-arm64.zip
+250c8e1736e7da045db478cb85ddc0ba8ae02ca22b2fe5fc033c444335734f3a *mksnapshot-v39.5.2-mas-x64.zip
+aeaf6d7f67dfd6b28e6c8be5a0d147e11bbb843c2b953c20fd8fcbc16178b015 *mksnapshot-v39.5.2-win32-arm64-x64.zip
+583a12e704ae437cefbfc3bda11a413535d92bc598133d32517db1e9bb406566 *mksnapshot-v39.5.2-win32-ia32.zip
+8d730a8ede9874203449b1d7f4486582714ebed3b00e7c5c2158926d26cec040 *mksnapshot-v39.5.2-win32-x64.zip
diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt
index 43aace217e9..c5cb12c7972 100644
--- a/build/checksums/nodejs.txt
+++ b/build/checksums/nodejs.txt
@@ -1,7 +1,7 @@
-c170d6554fba83d41d25a76cdbad85487c077e51fa73519e41ac885aa429d8af  node-v22.21.1-darwin-arm64.tar.gz
-8e3dc89614debe66c2a6ad2313a1adb06eb37db6cd6c40d7de6f7d987f7d1afd  node-v22.21.1-darwin-x64.tar.gz
-c86830dedf77f8941faa6c5a9c863bdfdd1927a336a46943decc06a38f80bfb2  node-v22.21.1-linux-arm64.tar.gz
-40d3d09aee556abc297dd782864fcc6b9e60acd438ff0660ba9ddcd569c00920  node-v22.21.1-linux-armv7l.tar.gz
-219a152ea859861d75adea578bdec3dce8143853c13c5187f40c40e77b0143b2  node-v22.21.1-linux-x64.tar.gz
-707bbc8a9e615299ecdbff9040f88f59f20033ff1af923beee749b885cbd565d  win-arm64/node.exe
-471961cb355311c9a9dd8ba417eca8269ead32a2231653084112554cda52e8b3  win-x64/node.exe
+5ed4db0fcf1eaf84d91ad12462631d73bf4576c1377e192d222e48026a902640  node-v22.22.0-darwin-arm64.tar.gz
+5ea50c9d6dea3dfa3abb66b2656f7a4e1c8cef23432b558d45fb538c7b5dedce  node-v22.22.0-darwin-x64.tar.gz
+25ba95dfb96871fa2ef977f11f95ea90818c8fa15c0f2110771db08d4ba423be  node-v22.22.0-linux-arm64.tar.gz
+a92684d8720589f19776fb186c5a3a4d273c13436fc8c44b61dd3eeef81f0d3a  node-v22.22.0-linux-armv7l.tar.gz
+c33c39ed9c80deddde77c960d00119918b9e352426fd604ba41638d6526a4744  node-v22.22.0-linux-x64.tar.gz
+fd44256121597d6a3707f4c7730b4e3733eacb5a95cc78a099f601d7e7f8290d  win-arm64/node.exe
+bae898add4643fcf890a83ad8ae56e20dce7e781cab161a53991ceba70c99ffb  win-x64/node.exe
diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
index dc7c5462436..f6e4e7afe49 100644
--- a/build/gulpfile.vscode.ts
+++ b/build/gulpfile.vscode.ts
@@ -474,7 +474,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 			.pipe(util.fixWin32DirectoryPermissions())
 			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
 			.pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
-			.pipe(filter(['**', '!LICENSE', '!version'], { dot: true }));
+			.pipe(filter(['**', '!LICENSE', '!version', ...(platform === 'darwin' ? ['!**/Contents/Applications/**'] : [])], { dot: true }));
 
 		if (platform === 'linux') {
 			result = es.merge(result, gulp.src('resources/completions/bash/code', { base: '.' })
diff --git a/cgmanifest.json b/cgmanifest.json
index 967a9abcebe..402496fb374 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -516,12 +516,12 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "6ac4ab19ad02803f03b54501193397563e99988e",
-					"tag": "22.21.1"
+					"commitHash": "6add85e4c46b8be383c8b637102d6b6fd206adce",
+					"tag": "22.22.0"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "22.21.1"
+			"version": "22.22.0"
 		},
 		{
 			"component": {
@@ -529,13 +529,13 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "9453e8bfe10fcec0440515dbc36ffe5941256d44",
-					"tag": "39.3.0"
+					"commitHash": "c49899af4c7079170a189a43c533b17a11808631",
+					"tag": "39.5.2"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "39.3.0"
+			"version": "39.5.2"
 		},
 		{
 			"component": {
diff --git a/package-lock.json b/package-lock.json
index 47f013803d7..6bc08ff0956 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -100,7 +100,7 @@
         "css-loader": "^6.9.1",
         "debounce": "^1.0.0",
         "deemon": "^1.13.6",
-        "electron": "39.3.0",
+        "electron": "39.5.2",
         "eslint": "^9.36.0",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
@@ -6586,9 +6586,9 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "39.3.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-39.3.0.tgz",
-      "integrity": "sha512-ZA2Cmu5Vs8zeuZBr71XWZ5vgm7lRDB9N50oV6ee7YocITyxRxx/apWFKY48Sxyn0gzVlX+6YQc3CS1PtYIkGUg==",
+      "version": "39.5.2",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-39.5.2.tgz",
+      "integrity": "sha512-EiGFKoTjCuJTsdNxSwOiKJvRbWOFHTmqnnVftpUUZf7rdMkvM6yn9i55uLNDKefvTE69M+vfMgGLa7HuY94WZg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
diff --git a/package.json b/package.json
index 57c00a12cfa..a43cf973e41 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.110.0",
-  "distro": "27cdb9e676748a9750bb217592c993ff5076ee6c",
+  "distro": "c3c943b0a748aa10a5d6818ab8e7c9e34e458d83",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -165,7 +165,7 @@
     "css-loader": "^6.9.1",
     "debounce": "^1.0.0",
     "deemon": "^1.13.6",
-    "electron": "39.3.0",
+    "electron": "39.5.2",
     "eslint": "^9.36.0",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",
diff --git a/remote/.npmrc b/remote/.npmrc
index 326fb9fd0f6..666ce9aaa8c 100644
--- a/remote/.npmrc
+++ b/remote/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://nodejs.org/dist"
-target="22.21.1"
-ms_build_id="374314"
+target="22.22.0"
+ms_build_id="406245"
 runtime="node"
 build_from_source="true"
 legacy-peer-deps="true"
diff --git a/src/main.ts b/src/main.ts
index ecbbb165479..ec2e45c31d2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -356,10 +356,6 @@ function configureCommandlineSwitchesSync(cliArgs: NativeParsedArgs) {
 	// use up to 2
 	app.commandLine.appendSwitch('max-active-webgl-contexts', '32');
 
-	// Disable Skia Graphite backend.
-	// Refs https://github.com/microsoft/vscode/issues/284162
-	app.commandLine.appendSwitch('disable-skia-graphite');
-
 	return argvConfig;
 }
 

From 1c7d85c39d7333d0a850006664cc93a6fdd0510d Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Fri, 13 Feb 2026 06:31:12 +0900
Subject: [PATCH 09/11] chore: add telemetry for gpu fallback mode triggered by
 skia (#290476)

---
 src/vs/code/electron-main/app.ts | 52 ++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 1be43717c32..0c6cc597309 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { app, powerMonitor, protocol, session, Session, systemPreferences, WebFrameMain } from 'electron';
+import { app, Details, GPUFeatureStatus, powerMonitor, protocol, session, Session, systemPreferences, WebFrameMain } from 'electron';
 import { addUNCHostToAllowlist, disableUNCAccessRestrictions } from '../../base/node/unc.js';
 import { validatedIpcMain } from '../../base/parts/ipc/electron-main/ipcMain.js';
 import { hostname, release } from 'os';
@@ -30,7 +30,7 @@ import { IBackupMainService } from '../../platform/backup/electron-main/backup.j
 import { BackupMainService } from '../../platform/backup/electron-main/backupMainService.js';
 import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
 import { ElectronExtensionHostDebugBroadcastChannel } from '../../platform/debug/electron-main/extensionHostDebugIpc.js';
-import { IDiagnosticsService } from '../../platform/diagnostics/common/diagnostics.js';
+import { IDiagnosticsService, IGPULogMessage } from '../../platform/diagnostics/common/diagnostics.js';
 import { DiagnosticsMainService, IDiagnosticsMainService } from '../../platform/diagnostics/electron-main/diagnosticsMainService.js';
 import { DialogMainService, IDialogMainService } from '../../platform/dialogs/electron-main/dialogMainService.js';
 import { IEncryptionMainService } from '../../platform/encryption/common/encryptionService.js';
@@ -1459,6 +1459,54 @@ export class CodeApplication extends Disposable {
 				telemetryService.publicLog2<PowerEvent, PowerEventClassification>('power.resume', getPowerEventData());
 			}));
 		});
+
+		// GPU crash telemetry for skia graphite out of order recording failures
+		// Refs https://github.com/microsoft/vscode/issues/284162
+		if (isMacintosh) {
+			instantiationService.invokeFunction(accessor => {
+				const telemetryService = accessor.get(ITelemetryService);
+				type GPUFeatureStatusWithSkiaGraphite = GPUFeatureStatus & {
+					skia_graphite: string;
+				};
+				const initialGpuFeatureStatus = app.getGPUFeatureStatus() as GPUFeatureStatusWithSkiaGraphite;
+				const skiaGraphiteEnabled: string = initialGpuFeatureStatus['skia_graphite'];
+				if (skiaGraphiteEnabled === 'enabled') {
+					this._register(Event.fromNodeEventEmitter<{ details: Details }>(app, 'child-process-gone', (event, details) => ({ event, details }))(({ details }) => {
+						if (details.type === 'GPU' && details.reason === 'crashed') {
+							const currentGpuFeatureStatus = app.getGPUFeatureStatus();
+							const currentRasterizationStatus: string = currentGpuFeatureStatus['rasterization'];
+							if (currentRasterizationStatus !== 'enabled') {
+								// Get last 10 GPU log messages (only the message field)
+								let gpuLogMessages: string[] = [];
+								type AppWithGPULogMethod = typeof app & {
+									getGPULogMessages(): IGPULogMessage[];
+								};
+								const customApp = app as AppWithGPULogMethod;
+								if (typeof customApp.getGPULogMessages === 'function') {
+									gpuLogMessages = customApp.getGPULogMessages().slice(-10).map(log => log.message);
+								}
+
+								type GpuCrashEvent = {
+									readonly gpuFeatureStatus: string;
+									readonly gpuLogMessages: string;
+								};
+								type GpuCrashClassification = {
+									gpuFeatureStatus: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Current GPU feature status.' };
+									gpuLogMessages: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Last 10 GPU log messages before crash.' };
+									owner: 'deepak1556';
+									comment: 'Tracks GPU process crashes that would result in fallback mode.';
+								};
+
+								telemetryService.publicLog2<GpuCrashEvent, GpuCrashClassification>('gpu.crash.fallback', {
+									gpuFeatureStatus: JSON.stringify(currentGpuFeatureStatus),
+									gpuLogMessages: JSON.stringify(gpuLogMessages)
+								});
+							}
+						}
+					}));
+				}
+			});
+		}
 	}
 
 	private async installMutex(): Promise<void> {

From a3e466a735b2949f9bf6fada6814385ab0ce9489 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Feb 2026 13:46:31 -0800
Subject: [PATCH 10/11] Bump qs from 6.14.1 to 6.14.2 in /test/mcp (#295038)

Bumps [qs](https://github.com/ljharb/qs) from 6.14.1 to 6.14.2.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.14.1...v6.14.2)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.14.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/mcp/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/mcp/package-lock.json b/test/mcp/package-lock.json
index 214a366c69c..699ff90a850 100644
--- a/test/mcp/package-lock.json
+++ b/test/mcp/package-lock.json
@@ -1120,9 +1120,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
-      "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
+      "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.1.0"

From e371f136a11126e19ddf0b384765652a1a148b9a Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Thu, 12 Feb 2026 15:01:33 -0800
Subject: [PATCH 11/11] add support for fetching active chat session (#294992)

* add support for fetching active chat session

* refactor: rename activeChatSession to activeChatPanelSession and update related events
---
 .../common/extensionsApiProposals.ts          |  2 +-
 .../api/browser/mainThreadChatAgents2.ts      |  3 +++
 .../workbench/api/common/extHost.api.impl.ts  |  8 ++++++++
 .../workbench/api/common/extHost.protocol.ts  |  1 +
 .../api/common/extHostChatAgents2.ts          | 19 +++++++++++++++++++
 src/vs/workbench/contrib/chat/browser/chat.ts |  5 +++++
 .../chat/browser/widget/chatWidgetService.ts  |  4 ++++
 .../test/browser/widget/mockChatWidget.ts     |  1 +
 .../test/browser/workbenchTestServices.ts     |  1 +
 ...scode.proposed.chatParticipantPrivate.d.ts | 15 ++++++++++++++-
 10 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index b6a71de582b..c4cc744d7e4 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -56,7 +56,7 @@ const _allApiProposals = {
 	},
 	chatParticipantPrivate: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts',
-		version: 13
+		version: 14
 	},
 	chatPromptFiles: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatPromptFiles.d.ts',
diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
index 9aeea40f6d5..06341d03c02 100644
--- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
@@ -145,6 +145,9 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 		this._register(this._chatService.onDidReceiveQuestionCarouselAnswer(e => {
 			this._proxy.$handleQuestionCarouselAnswer(e.requestId, e.resolveId, e.answers);
 		}));
+		this._register(this._chatWidgetService.onDidChangeFocusedWidget(widget => {
+			this._proxy.$acceptActiveChatSession(widget?.viewModel?.sessionResource);
+		}));
 	}
 
 	$unregisterAgent(handle: number): void {
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index d41aab9b5d6..b8e9775191a 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -1044,6 +1044,14 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'chatStatusItem');
 				return extHostChatStatus.createChatStatusItem(extension, id);
 			},
+			get activeChatPanelSessionResource() {
+				checkProposedApiEnabled(extension, 'chatParticipantPrivate');
+				return extHostChatAgents2.activeChatPanelSessionResource;
+			},
+			onDidChangeActiveChatPanelSessionResource: (listeners, thisArgs?, disposables?) => {
+				checkProposedApiEnabled(extension, 'chatParticipantPrivate');
+				return _asExtensionEvent(extHostChatAgents2.onDidChangeActiveChatPanelSessionResource)(listeners, thisArgs, disposables);
+			},
 		};
 
 		// namespace: workspace
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 566fcf1c240..c596dbbf2a6 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -1476,6 +1476,7 @@ export interface ExtHostChatAgentsShape2 {
 	$providePromptFiles(handle: number, type: PromptsType, context: IPromptFileContext, token: CancellationToken): Promise<Dto<IPromptFileResource>[] | undefined>;
 	$setRequestTools(requestId: string, tools: UserSelectedTools): void;
 	$setYieldRequested(requestId: string): void;
+	$acceptActiveChatSession(sessionResource: UriComponents | undefined): void;
 }
 export interface IChatParticipantMetadata {
 	participant: string;
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index 4df866f871d..4cc0bc3cf55 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -487,6 +487,15 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 	private readonly _onDidDisposeChatSession = this._register(new Emitter<string>());
 	readonly onDidDisposeChatSession = this._onDidDisposeChatSession.event;
 
+	private _activeChatPanelSessionResource: URI | undefined;
+
+	private readonly _onDidChangeActiveChatPanelSessionResource = this._register(new Emitter<URI | undefined>());
+	readonly onDidChangeActiveChatPanelSessionResource = this._onDidChangeActiveChatPanelSessionResource.event;
+
+	get activeChatPanelSessionResource(): URI | undefined {
+		return this._activeChatPanelSessionResource;
+	}
+
 	constructor(
 		mainContext: IMainContext,
 		private readonly _logService: ILogService,
@@ -877,6 +886,16 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		}
 	}
 
+	$acceptActiveChatSession(sessionResourceDto: UriComponents | undefined): void {
+		const sessionResource = sessionResourceDto ? URI.revive(sessionResourceDto) : undefined;
+		if (this._activeChatPanelSessionResource?.toString() === sessionResource?.toString()) {
+			return;
+		}
+
+		this._activeChatPanelSessionResource = sessionResource;
+		this._onDidChangeActiveChatPanelSessionResource.fire(sessionResource);
+	}
+
 	async $provideFollowups(requestDto: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatFollowup[]> {
 		const agent = this._agents.get(handle);
 		if (!agent) {
diff --git a/src/vs/workbench/contrib/chat/browser/chat.ts b/src/vs/workbench/contrib/chat/browser/chat.ts
index fc4423e96d1..1cace4dc134 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.ts
@@ -121,6 +121,11 @@ export interface IChatWidgetService {
 	 */
 	readonly onDidBackgroundSession: Event<URI>;
 
+	/**
+	 * Fires when the focused chat widget changes.
+	 */
+	readonly onDidChangeFocusedWidget: Event<IChatWidget | undefined>;
+
 	/**
 	 * Reveals the widget, focusing its input unless `preserveFocus` is true.
 	 */
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.ts b/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.ts
index aeee92322a3..9e5ce02f368 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.ts
@@ -33,6 +33,9 @@ export class ChatWidgetService extends Disposable implements IChatWidgetService
 	private readonly _onDidBackgroundSession = this._register(new Emitter<URI>());
 	readonly onDidBackgroundSession = this._onDidBackgroundSession.event;
 
+	private readonly _onDidChangeFocusedWidget = this._register(new Emitter<IChatWidget | undefined>());
+	readonly onDidChangeFocusedWidget = this._onDidChangeFocusedWidget.event;
+
 	constructor(
 		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
 		@IViewsService private readonly viewsService: IViewsService,
@@ -218,6 +221,7 @@ export class ChatWidgetService extends Disposable implements IChatWidgetService
 		}
 
 		this._lastFocusedWidget = widget;
+		this._onDidChangeFocusedWidget.fire(widget);
 	}
 
 	register(newWidget: IChatWidget): IDisposable {
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/mockChatWidget.ts b/src/vs/workbench/contrib/chat/test/browser/widget/mockChatWidget.ts
index 2014bd9b9d4..7e7d3336a17 100644
--- a/src/vs/workbench/contrib/chat/test/browser/widget/mockChatWidget.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/mockChatWidget.ts
@@ -12,6 +12,7 @@ import { ChatAgentLocation } from '../../../common/constants.js';
 export class MockChatWidgetService implements IChatWidgetService {
 	readonly onDidAddWidget: Event<IChatWidget> = Event.None;
 	readonly onDidBackgroundSession: Event<URI> = Event.None;
+	readonly onDidChangeFocusedWidget: Event<IChatWidget | undefined> = Event.None;
 
 	readonly _serviceBrand: undefined;
 
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index 5f9844e71e8..0684952209a 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -2140,6 +2140,7 @@ export class TestChatWidgetService implements IChatWidgetService {
 
 	onDidAddWidget = Event.None;
 	onDidBackgroundSession = Event.None;
+	onDidChangeFocusedWidget = Event.None;
 
 	async reveal(widget: IChatWidget, preserveFocus?: boolean): Promise<boolean> { return false; }
 	async revealWidget(preserveFocus?: boolean): Promise<IChatWidget | undefined> { return undefined; }
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index ad37a1404ce..63f9ec24884 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// version: 13
+// version: 14
 
 declare module 'vscode' {
 
@@ -335,6 +335,19 @@ declare module 'vscode' {
 		export const onDidDisposeChatSession: Event<string>;
 	}
 
+	export namespace window {
+		/**
+		 * The resource URI of the currently active chat panel session,
+		 * or `undefined` if there is no active chat panel session.
+		 */
+		export const activeChatPanelSessionResource: Uri | undefined;
+
+		/**
+		 * An event that fires when the active chat panel session resource changes.
+		 */
+		export const onDidChangeActiveChatPanelSessionResource: Event<Uri | undefined>;
+	}
+
 	// #endregion
 
 	// #region ChatErrorDetailsWithConfirmation