[pull] main from microsoft:main

build/azure-pipelines/product-compile.yml

@@ -100,6 +100,23 @@ jobs:
           GITHUB_TOKEN: "$(github-distro-mixin-password)"
         displayName: Compile & Hygiene
 
+      - script: |
+          set -e
+
+          [ -d "out-build" ] || { echo "ERROR: out-build folder is missing" >&2; exit 1; }
+          [ -n "$(find out-build -mindepth 1 2>/dev/null | head -1)" ] || { echo "ERROR: out-build folder is empty" >&2; exit 1; }
+          echo "out-build exists and is not empty"
+
+          ls -d out-vscode-* >/dev/null 2>&1 || { echo "ERROR: No out-vscode-* folders found" >&2; exit 1; }
+          for folder in out-vscode-*; do
+            [ -d "$folder" ] || { echo "ERROR: $folder is missing" >&2; exit 1; }
+            [ -n "$(find "$folder" -mindepth 1 2>/dev/null | head -1)" ] || { echo "ERROR: $folder is empty" >&2; exit 1; }
+            echo "$folder exists and is not empty"
+          done
+
+          echo "All required compilation folders checked."
+        displayName: Validate compilation folders
+
       - script: |
           set -e
           npm run compile

extensions/simple-browser/package.json

@@ -51,6 +51,15 @@
             "default": true,
             "title": "Focus Lock Indicator Enabled",
             "description": "%configuration.focusLockIndicator.enabled.description%"
+          },
+          "simpleBrowser.useIntegratedBrowser": {
+            "type": "boolean",
+            "default": false,
+            "markdownDescription": "%configuration.useIntegratedBrowser.description%",
+            "scope": "application",
+            "tags": [
+              "experimental"
+            ]
           }
         }
       }

extensions/simple-browser/package.nls.json

@@ -1,5 +1,6 @@
 {
 	"displayName": "Simple Browser",
 	"description": "A very basic built-in webview for displaying web content.",
-	"configuration.focusLockIndicator.enabled.description": "Enable/disable the floating indicator that shows when focused in the simple browser."
+	"configuration.focusLockIndicator.enabled.description": "Enable/disable the floating indicator that shows when focused in the simple browser.",
+	"configuration.useIntegratedBrowser.description": "When enabled, the `simpleBrowser.show` command will open URLs in the integrated browser instead of the Simple Browser webview. **Note:** This setting is experimental and only available on desktop."
 }

extensions/simple-browser/src/extension.ts

@@ -14,6 +14,8 @@ declare class URL {
 
 const openApiCommand = 'simpleBrowser.api.open';
 const showCommand = 'simpleBrowser.show';
+const integratedBrowserCommand = 'workbench.action.browser.open';
+const useIntegratedBrowserSetting = 'simpleBrowser.useIntegratedBrowser';
 
 const enabledHosts = new Set<string>([
 	'localhost',
@@ -31,6 +33,27 @@ const enabledHosts = new Set<string>([
 
 const openerId = 'simpleBrowser.open';
 
+/**
+ * Checks if the integrated browser should be used instead of the simple browser
+ */
+async function shouldUseIntegratedBrowser(): Promise<boolean> {
+	const config = vscode.workspace.getConfiguration();
+	if (!config.get<boolean>(useIntegratedBrowserSetting, false)) {
+		return false;
+	}
+
+	// Verify that the integrated browser command is available
+	const commands = await vscode.commands.getCommands(true);
+	return commands.includes(integratedBrowserCommand);
+}
+
+/**
+ * Opens a URL in the integrated browser
+ */
+async function openInIntegratedBrowser(url?: string): Promise<void> {
+	await vscode.commands.executeCommand(integratedBrowserCommand, url);
+}
+
 export function activate(context: vscode.ExtensionContext) {
 
 	const manager = new SimpleBrowserManager(context.extensionUri);
@@ -43,6 +66,10 @@ export function activate(context: vscode.ExtensionContext) {
 	}));
 
 	context.subscriptions.push(vscode.commands.registerCommand(showCommand, async (url?: string) => {
+		if (await shouldUseIntegratedBrowser()) {
+			return openInIntegratedBrowser(url);
+		}
+
 		if (!url) {
 			url = await vscode.window.showInputBox({
 				placeHolder: vscode.l10n.t("https://example.com"),
@@ -55,11 +82,15 @@ export function activate(context: vscode.ExtensionContext) {
 		}
 	}));
 
-	context.subscriptions.push(vscode.commands.registerCommand(openApiCommand, (url: vscode.Uri, showOptions?: {
+	context.subscriptions.push(vscode.commands.registerCommand(openApiCommand, async (url: vscode.Uri, showOptions?: {
 		preserveFocus?: boolean;
 		viewColumn: vscode.ViewColumn;
 	}) => {
-		manager.show(url, showOptions);
+		if (await shouldUseIntegratedBrowser()) {
+			await openInIntegratedBrowser(url.toString(true));
+		} else {
+			manager.show(url, showOptions);
+		}
 	}));
 
 	context.subscriptions.push(vscode.window.registerExternalUriOpener(openerId, {
@@ -74,10 +105,14 @@ export function activate(context: vscode.ExtensionContext) {
 
 			return vscode.ExternalUriOpenerPriority.None;
 		},
-		openExternalUri(resolveUri: vscode.Uri) {
-			return manager.show(resolveUri, {
-				viewColumn: vscode.window.activeTextEditor ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active
-			});
+		async openExternalUri(resolveUri: vscode.Uri) {
+			if (await shouldUseIntegratedBrowser()) {
+				await openInIntegratedBrowser(resolveUri.toString(true));
+			} else {
+				return manager.show(resolveUri, {
+					viewColumn: vscode.window.activeTextEditor ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active
+				});
+			}
 		}
 	}, {
 		schemes: ['http', 'https'],

extensions/theme-defaults/themes/dark_modern.json

@@ -13,12 +13,12 @@
 		"badge.background": "#616161",
 		"badge.foreground": "#F8F8F8",
 		"button.background": "#0078D4",
-		"button.border": "#FFFFFF12",
+		"button.border": "#ffffff1a",
 		"button.foreground": "#FFFFFF",
 		"button.hoverBackground": "#026EC1",
-		"button.secondaryBackground": "#313131",
+		"button.secondaryBackground": "#00000000",
 		"button.secondaryForeground": "#CCCCCC",
-		"button.secondaryHoverBackground": "#3C3C3C",
+		"button.secondaryHoverBackground": "#2B2B2B",
 		"chat.slashCommandBackground": "#26477866",
 		"chat.slashCommandForeground": "#85B6FF",
 		"chat.editedFileForeground": "#E2C08D",

extensions/tunnel-forwarding/src/extension.ts

@@ -25,7 +25,11 @@ const cliPath = process.env.VSCODE_FORWARDING_IS_DEV
 	? path.join(__dirname, '../../../cli/target/debug/code')
 	: path.join(
 		vscode.env.appRoot,
-		process.platform === 'darwin' ? 'bin' : '../../bin',
+		process.platform === 'darwin'
+			? 'bin'
+			: process.platform === 'win32' && vscode.env.appQuality === 'insider'
+				? '../../../bin' // TODO: remove as part of https://github.com/microsoft/vscode/issues/282514
+				: '../../bin',
 		vscode.env.appQuality === 'stable' ? 'code-tunnel' : 'code-tunnel-insiders',
 	) + (process.platform === 'win32' ? '.exe' : '');
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.109.0",
-  "distro": "ce89ce05183635114ccfc46870d71ec520727c8e",
+  "distro": "b570759d1928b4b2f34a86c40da42b1a2b6d3796",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -109,7 +109,7 @@
     "native-is-elevated": "0.8.0",
     "native-keymap": "^3.3.5",
     "native-watchdog": "^1.4.1",
-    "node-pty": "^1.1.0-beta43",
+    "node-pty": "^1.2.0-beta.6",
     "open": "^10.1.2",
     "tas-client": "0.3.1",
     "undici": "^7.9.0",
@@ -240,4 +240,4 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.5.0"
   }
-}
+}

remote/package.json

@@ -33,7 +33,7 @@
     "kerberos": "2.1.1",
     "minimist": "^1.2.8",
     "native-watchdog": "^1.4.1",
-    "node-pty": "^1.1.0-beta43",
+    "node-pty": "^1.2.0-beta.6",
     "tas-client": "0.3.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",

src/vs/base/browser/ui/button/button.css

@@ -7,14 +7,21 @@
 	box-sizing: border-box;
 	display: flex;
 	width: 100%;
-	padding: 4px;
-	border-radius: 2px;
+	padding: 4px 8px;
+	border-radius: 4px;
 	text-align: center;
 	cursor: pointer;
 	justify-content: center;
 	align-items: center;
 	border: 1px solid var(--vscode-button-border, transparent);
-	line-height: 18px;
+	line-height: 16px;
+	font-size: 12px;
+}
+
+.monaco-text-button.small {
+	line-height: 14px;
+	font-size: 11px;
+	padding: 3px 6px;
 }
 
 .monaco-text-button:focus {
@@ -61,6 +68,7 @@
 	align-items: center;
 	font-weight: normal;
 	font-style: inherit;
+	line-height: 18px;
 	padding: 4px 0;
 }
 
@@ -100,13 +108,13 @@
 .monaco-button-dropdown > .monaco-button.monaco-dropdown-button {
 	border: 1px solid var(--vscode-button-border, transparent);
 	border-left-width: 0 !important;
-	border-radius: 0 2px 2px 0;
+	border-radius: 0 4px 4px 0;
 	display: flex;
 	align-items: center;
 }
 
 .monaco-button-dropdown > .monaco-button.monaco-text-button {
-	border-radius: 2px 0 0 2px;
+	border-radius: 4px 0 0 4px;
 }
 
 .monaco-description-button {

src/vs/base/browser/ui/button/button.ts

@@ -35,6 +35,7 @@ export interface IButtonOptions extends Partial<IButtonStyles> {
 	readonly supportIcons?: boolean;
 	readonly supportShortLabel?: boolean;
 	readonly secondary?: boolean;
+	readonly small?: boolean;
 	readonly hoverDelegate?: IHoverDelegate;
 	readonly disabled?: boolean;
 }
@@ -116,6 +117,7 @@ export class Button extends Disposable implements IButton {
 		this._element.setAttribute('role', 'button');
 
 		this._element.classList.toggle('secondary', !!options.secondary);
+		this._element.classList.toggle('small', !!options.small);
 		const background = options.secondary ? options.buttonSecondaryBackground : options.buttonBackground;
 		const foreground = options.secondary ? options.buttonSecondaryForeground : options.buttonForeground;
 

src/vs/base/browser/ui/dialog/dialog.css

@@ -194,7 +194,6 @@
 }
 
 .monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button {
-	padding: 4px 10px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	margin: 4px 5px; /* allows button focus outline to be visible */
@@ -228,19 +227,14 @@
 	outline-width: 1px;
 	outline-style: solid;
 	outline-color: var(--vscode-focusBorder);
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
-.monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-text-button {
-	padding-left: 10px;
-	padding-right: 10px;
-}
 
 .monaco-dialog-box.align-vertical > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-text-button {
 	width: 100%;
 }
 
 .monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-dropdown-button {
-	padding-left: 5px;
-	padding-right: 5px;
+	padding: 0 4px;
 }

src/vs/base/browser/ui/inputbox/inputBox.css

@@ -8,7 +8,7 @@
 	display: block;
 	padding: 0;
 	box-sizing:	border-box;
-	border-radius: 2px;
+	border-radius: 4px;
 
 	/* Customizable */
 	font-size: inherit;

src/vs/base/browser/ui/selectBox/selectBox.css

@@ -6,7 +6,7 @@
 .monaco-select-box {
 	width: 100%;
 	cursor: pointer;
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
 .monaco-select-box-dropdown-container {
@@ -30,6 +30,6 @@
 
 .mac .monaco-action-bar .action-item .monaco-select-box {
 	font-size: 11px;
-	border-radius: 3px;
+	border-radius: 4px;
 	min-height: 24px;
 }

src/vs/base/browser/ui/selectBox/selectBoxCustom.css

@@ -6,7 +6,7 @@
 .monaco-select-box-dropdown-container {
 	display: none;
 	box-sizing: border-box;
-	border-radius: 5px;
+	border-radius: 4px;
 	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
 }
 

src/vs/editor/contrib/rename/browser/renameWidget.css

@@ -15,7 +15,7 @@
 
 .monaco-editor .rename-box .rename-input-with-button {
 	padding: 3px;
-	border-radius: 2px;
+	border-radius: 4px;
 	width: calc(100% - 8px); /* 4px padding on each side */
 }
 

src/vs/platform/accessibility/browser/accessibleView.ts

@@ -21,6 +21,7 @@ export const enum AccessibleViewProviderId {
 	MergeEditor = 'mergeEditor',
 	PanelChat = 'panelChat',
 	ChatTerminalOutput = 'chatTerminalOutput',
+	ChatThinking = 'chatThinking',
 	InlineChat = 'inlineChat',
 	AgentChat = 'agentChat',
 	QuickChat = 'quickChat',