[pull] main from microsoft:main

build/lib/policies/policyData.jsonc

@@ -39,28 +39,28 @@
     ],
     "policies": [
         {
-            "key": "chat.mcp.gallery.serviceUrl",
-            "name": "McpGalleryServiceUrl",
-            "category": "InteractiveSession",
-            "minimumVersion": "1.101",
+            "key": "extensions.gallery.serviceUrl",
+            "name": "ExtensionGalleryServiceUrl",
+            "category": "Extensions",
+            "minimumVersion": "1.99",
             "localization": {
                 "description": {
-                    "key": "mcp.gallery.serviceUrl",
-                    "value": "Configure the MCP Gallery service URL to connect to"
+                    "key": "extensions.gallery.serviceUrl",
+                    "value": "Configure the Marketplace service URL to connect to"
                 }
             },
             "type": "string",
             "default": ""
         },
         {
-            "key": "extensions.gallery.serviceUrl",
-            "name": "ExtensionGalleryServiceUrl",
-            "category": "Extensions",
-            "minimumVersion": "1.99",
+            "key": "chat.mcp.gallery.serviceUrl",
+            "name": "McpGalleryServiceUrl",
+            "category": "InteractiveSession",
+            "minimumVersion": "1.101",
             "localization": {
                 "description": {
-                    "key": "extensions.gallery.serviceUrl",
-                    "value": "Configure the Marketplace service URL to connect to"
+                    "key": "mcp.gallery.serviceUrl",
+                    "value": "Configure the MCP Gallery service URL to connect to"
                 }
             },
             "type": "string",
@@ -286,6 +286,20 @@
             },
             "type": "boolean",
             "default": true
+        },
+        {
+            "key": "workbench.browser.enableChatTools",
+            "name": "BrowserChatTools",
+            "category": "InteractiveSession",
+            "minimumVersion": "1.110",
+            "localization": {
+                "description": {
+                    "key": "browser.enableChatTools",
+                    "value": "When enabled, chat agents can use browser tools to open and interact with pages in the Integrated Browser."
+                }
+            },
+            "type": "boolean",
+            "default": false
         }
     ]
 }

extensions/theme-2026/themes/styles.css

@@ -17,6 +17,10 @@
 	--shadow-button-active: inset 0 1px 2px rgba(0, 0, 0, 0.1);
 	--shadow-active-tab: 0 8px 12px rgba(0, 0, 0, 0.02);
 
+	/* Panel depth shadows cast onto the editor surface */
+	--shadow-depth-x: 5px 0 10px -4px rgba(0, 0, 0, 0.05);
+	--shadow-depth-y: 0 5px 10px -4px rgba(0, 0, 0, 0.04);
+
 	--backdrop-blur-md: blur(20px) saturate(180%);
 	--backdrop-blur-lg: blur(40px) saturate(180%);
 }
@@ -25,16 +29,17 @@
 .monaco-workbench.vs-dark {
 	--backdrop-blur-md: blur(20px) saturate(180%) brightness(0.55);
 	--backdrop-blur-lg: blur(40px) saturate(180%) brightness(0.55);
-}
-
-/* Stealth Shadows - shadow-based depth for UI elements, controlled by workbench.stealthShadows.enabled */
 
-/* Activity Bar */
-.monaco-workbench.vs .part.activitybar {
-	z-index: 50;
-	position: relative;
+	--shadow-depth-x: 5px 0 12px -4px rgba(0, 0, 0, 0.14);
+	--shadow-depth-y: 0 5px 12px -4px rgba(0, 0, 0, 0.10);
 }
 
+/* Stealth Shadows - panels appear to float above the editor.
+ * Instead of z-index on panels (which breaks webviews, iframes, sashes),
+ * the editor draws its own "received shadow" via a ::after pseudo-element.
+ * The surrounding panels stay at default stacking — no z-index needed. */
+
+/* Activity Bar - only needs shadow when sidebar is hidden */
 .monaco-workbench.nosidebar .part.activitybar {
 	box-shadow: var(--shadow-md);
 }
@@ -43,94 +48,61 @@
 	box-shadow: var(--shadow-md);
 }
 
-/* Sidebar */
-.monaco-workbench.vs .part.sidebar {
-	box-shadow: var(--shadow-md);
-	z-index: 40;
-	position: relative;
-}
-
-.monaco-workbench.sidebar-right.vs .part.sidebar {
-	box-shadow: var(--shadow-md);
-}
-
-.monaco-workbench.vs .part.auxiliarybar {
-	box-shadow: var(--shadow-md);
-	z-index: 35;
-	position: relative;
-}
-
-/* Ensure iframe containers in pane-body render above sidebar z-index */
-.monaco-workbench.vs > div[data-keybinding-context] {
-	z-index: 50 !important;
-}
-
-/* Ensure in-editor pane iframes render below sidebar z-index */
-.monaco-workbench.vs > div[data-parent-flow-to-element-id] {
-	z-index: 0 !important;
-}
-
-
-/* Ensure webview containers render above sidebar z-index */
-.monaco-workbench.vs .part.sidebar .webview,
-.monaco-workbench.vs .part.sidebar .webview-container,
-.monaco-workbench.vs .part.auxiliarybar .webview,
-.monaco-workbench.vs .part.auxiliarybar .webview-container {
-	position: relative;
-	z-index: 50;
-	transform: translateZ(0);
-}
-
-/* Panel */
-.monaco-workbench.vs .part.panel {
-	box-shadow: var(--shadow-md);
-	position: relative;
-}
-
-.monaco-workbench.panel-position-left.vs .part.panel {
-	box-shadow: var(--shadow-md);
-}
-
-.monaco-workbench.panel-position-right.vs .part.panel {
-	box-shadow: var(--shadow-md);
-}
-
 .monaco-pane-view .split-view-view:first-of-type > .pane > .pane-header {
 	border-top: 1px solid var(--vscode-sideBarSectionHeader-border) !important;
 }
 
-/* Sashes - ensure they extend full height and are above other panels */
-.monaco-workbench.vs .monaco-sash {
-	z-index: 35;
+/* Editor - the ::after pseudo-element draws inset shadows on each edge,
+ * creating the illusion that sidebar, panel, and auxiliarybar float above it. */
+.monaco-workbench.vs .part.editor {
+	position: relative;
 }
 
-.monaco-workbench.vs .monaco-sash.vertical {
-	z-index: 40;
+.monaco-workbench.vs .part.editor::after {
+	content: '';
+	position: absolute;
+	inset: 0;
+	pointer-events: none;
+	z-index: 10;
+	box-shadow:
+		inset var(--shadow-depth-x),
+		inset calc(-1 * 5px) 0 10px -4px rgba(0, 0, 0, 0.04),
+		inset 0 calc(-1 * 5px) 10px -4px rgba(0, 0, 0, 0.05);
 }
 
-.monaco-workbench.vs .monaco-sash.vertical:nth-child(2) {
-	z-index: 45;
+/* When sidebar is on the right, flip the stronger shadow to the right edge */
+.monaco-workbench.sidebar-right.vs .part.editor::after {
+	box-shadow:
+		inset 5px 0 10px -4px rgba(0, 0, 0, 0.04),
+		inset calc(-1 * 5px) 0 10px -4px rgba(0, 0, 0, 0.05),
+		inset 0 calc(-1 * 5px) 10px -4px rgba(0, 0, 0, 0.05);
 }
 
-.monaco-workbench.vs .monaco-sash.horizontal {
-	z-index: 35;
+/* Panel positions: strengthen the shadow on whichever edge faces the panel */
+.monaco-workbench.panel-position-left.vs .part.editor::after {
+	box-shadow:
+		inset var(--shadow-depth-x),
+		inset calc(-1 * 5px) 0 10px -4px rgba(0, 0, 0, 0.04);
 }
 
-/* Editor */
-.monaco-workbench.vs .part.editor {
-	position: relative;
+.monaco-workbench.panel-position-right.vs .part.editor::after {
+	box-shadow:
+		inset 5px 0 10px -4px rgba(0, 0, 0, 0.04),
+		inset calc(-1 * 5px) 0 10px -4px rgba(0, 0, 0, 0.05);
 }
 
+.monaco-workbench.panel-position-top.vs .part.editor::after {
+	box-shadow:
+		inset var(--shadow-depth-x),
+		inset calc(-1 * 5px) 0 10px -4px rgba(0, 0, 0, 0.04),
+		inset 0 var(--shadow-depth-y);
+}
 .monaco-workbench.vs .part.editor > .content .editor-group-container > .title {
 	box-shadow: none;
-	position: relative;
-	z-index: 10;
 }
 
 .monaco-workbench.vs .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active {
 	box-shadow: inset var(--shadow-active-tab);
-	position: relative;
-	z-index: 5;
 }
 
 .monaco-workbench.vs .part.editor > .content .editor-group-container > .title .tabs-container > .tab:hover:not(.active) {
@@ -636,10 +608,6 @@
 
 /* Notebook */
 
-.monaco-workbench .notebookOverlay.notebook-editor {
-	z-index: 35 !important;
-}
-
 .monaco-workbench .notebookOverlay .monaco-list-row .cell-editor-part:before {
 	box-shadow: inset var(--shadow-sm);
 	border-radius: var(--radius-md);

extensions/theme-seti/build/update-icon-theme.js

@@ -47,7 +47,11 @@ const inheritIconFromLanguage = {
 	"jsonl": 'json',
 	"postcss": 'css',
 	"django-html": 'html',
-	"blade": 'php'
+	"blade": 'php',
+	"prompt": 'markdown',
+	"instructions": 'markdown',
+	"chatagent": 'markdown',
+	"skill": 'markdown'
 };
 
 const ignoreExtAssociation = {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.110.0",
-  "distro": "1b8e5b3448f8be12228bc9bee56b42a5f95158e7",
+  "distro": "2d57806cfc4400f602f114b4bfc0fb17ce7e1a32",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -249,4 +249,4 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.6.1"
   }
-}
+}

src/vs/code/electron-browser/workbench/workbench-dev.html

@@ -65,6 +65,7 @@
 					tokenizeToString
 					notebookChatEditController
 					richScreenReaderContent
+					chatDebugTokenizer
 				;
 		"/>
 	</head>

src/vs/code/electron-browser/workbench/workbench.html

@@ -63,6 +63,7 @@
 					tokenizeToString
 					notebookChatEditController
 					richScreenReaderContent
+					chatDebugTokenizer
 				;
 		"/>
 

src/vs/platform/actionWidget/browser/actionList.ts

@@ -787,7 +787,8 @@ export class ActionList<T> extends Disposable {
 			availableHeight = widgetTop > 0 ? windowHeight - widgetTop - padding : windowHeight * 0.7;
 		}
 
-		const maxHeight = Math.max(availableHeight, this._actionLineHeight * 3 + filterHeight);
+		const viewportMaxHeight = Math.floor(targetWindow.innerHeight * 0.4);
+		const maxHeight = Math.min(Math.max(availableHeight, this._actionLineHeight * 3 + filterHeight), viewportMaxHeight);
 		const height = Math.min(listHeight + filterHeight, maxHeight);
 		return height - filterHeight;
 	}

src/vs/platform/extensions/common/extensionsApiProposals.ts

@@ -45,7 +45,7 @@ const _allApiProposals = {
 	},
 	chatDebug: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatDebug.d.ts',
-		version: 1
+		version: 2
 	},
 	chatHooks: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatHooks.d.ts',