code · pull · Jun 24, 2025 · Jun 23, 2025 · Jun 23, 2025 · Jun 24, 2025
diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
@@ -56,6 +56,7 @@
 		"--vscode-chat-requestBackground",
 		"--vscode-chat-requestBorder",
 		"--vscode-chat-requestBubbleBackground",
+		"--vscode-chat-requestBubbleHoverBackground",
 		"--vscode-chat-requestCodeBorder",
 		"--vscode-chat-slashCommandBackground",
 		"--vscode-chat-slashCommandForeground",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.102.0",
-  "distro": "7ce718aa7d6b04351dae613ead2c3e31d6e59e4f",
+  "distro": "ae33edbae267b91c1360906732e4b0eebdbff862",
   "author": {
     "name": "Microsoft Corporation"
   },

diff --git a/src/vs/base/browser/ui/list/list.ts b/src/vs/base/browser/ui/list/list.ts
@@ -20,6 +20,7 @@ export interface IListVirtualDelegate<T> {
 
 export interface IListElementRenderDetails {
 	readonly height?: number;
+	readonly onScroll?: boolean;
 }
 
 export interface IListRenderer<T, TTemplateData> {

diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
@@ -897,7 +897,7 @@ export class ListView<T> implements IListView<T> {
 
 	// Render
 
-	protected render(previousRenderRange: IRange, renderTop: number, renderHeight: number, renderLeft: number | undefined, scrollWidth: number | undefined, updateItemsInDOM: boolean = false): void {
+	protected render(previousRenderRange: IRange, renderTop: number, renderHeight: number, renderLeft: number | undefined, scrollWidth: number | undefined, updateItemsInDOM: boolean = false, onScroll: boolean = false): void {
 		const renderRange = this.getRenderRange(renderTop, renderHeight);
 
 		const rangesToInsert = Range.relativeComplement(renderRange, previousRenderRange).reverse();
@@ -914,7 +914,7 @@ export class ListView<T> implements IListView<T> {
 		this.cache.transact(() => {
 			for (const range of rangesToRemove) {
 				for (let i = range.start; i < range.end; i++) {
-					this.removeItemFromDOM(i);
+					this.removeItemFromDOM(i, onScroll);
 				}
 			}
 
@@ -1041,7 +1041,7 @@ export class ListView<T> implements IListView<T> {
 		item.row!.domNode.classList.toggle('drop-target', item.dropTarget);
 	}
 
-	private removeItemFromDOM(index: number): void {
+	private removeItemFromDOM(index: number, onScroll?: boolean): void {
 		const item = this.items[index];
 		item.dragStartDisposable.dispose();
 		item.checkedDisposable.dispose();
@@ -1050,7 +1050,7 @@ export class ListView<T> implements IListView<T> {
 			const renderer = this.renderers.get(item.templateId);
 
 			if (renderer && renderer.disposeElement) {
-				renderer.disposeElement(item.element, index, item.row.templateData, { height: item.size });
+				renderer.disposeElement(item.element, index, item.row.templateData, { height: item.size, onScroll });
 			}
 
 			this.cache.release(item.row);
@@ -1151,7 +1151,7 @@ export class ListView<T> implements IListView<T> {
 	private onScroll(e: ScrollEvent): void {
 		try {
 			const previousRenderRange = this.getRenderRange(this.lastRenderTop, this.lastRenderHeight);
-			this.render(previousRenderRange, e.scrollTop, e.height, e.scrollLeft, e.scrollWidth);
+			this.render(previousRenderRange, e.scrollTop, e.height, e.scrollLeft, e.scrollWidth, undefined, true);
 
 			if (this.supportDynamicHeights) {
 				this._rerender(e.scrollTop, e.height, e.inSmoothScrolling);

diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
@@ -134,6 +134,7 @@ export interface INativeEnvironmentService extends IEnvironmentService {
 	appSettingsHome: URI;
 	tmpDir: URI;
 	userDataPath: string;
+	machineSettingsResource: URI;
 
 	// --- extensions
 	extensionsPath: string;

diff --git a/src/vs/platform/environment/common/environmentService.ts b/src/vs/platform/environment/common/environmentService.ts
@@ -82,6 +82,9 @@ export abstract class AbstractNativeEnvironmentService implements INativeEnviron
 	@memoize
 	get sync(): 'on' | 'off' | undefined { return this.args.sync; }
 
+	@memoize
+	get machineSettingsResource(): URI { return joinPath(URI.file(join(this.userDataPath, 'Machine')), 'settings.json'); }
+
 	@memoize
 	get workspaceStorageHome(): URI { return joinPath(this.appSettingsHome, 'workspaceStorage'); }
 

diff --git a/src/vs/platform/mcp/common/mcpManagement.ts b/src/vs/platform/mcp/common/mcpManagement.ts
@@ -4,31 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../base/common/cancellation.js';
-import { IStringDictionary } from '../../../base/common/collections.js';
 import { Event } from '../../../base/common/event.js';
 import { URI } from '../../../base/common/uri.js';
 import { SortBy, SortOrder } from '../../extensionManagement/common/extensionManagement.js';
 import { createDecorator } from '../../instantiation/common/instantiation.js';
-import { IMcpServerConfiguration, IMcpServerVariable } from './mcpPlatformTypes.js';
-
-export interface IScannedMcpServers {
-	servers?: IStringDictionary<IScannedMcpServer>;
-	inputs?: IMcpServerVariable[];
-}
-
-export interface IScannedMcpServer {
-	readonly id: string;
-	readonly name: string;
-	readonly version: string;
-	readonly gallery?: boolean;
-	readonly config: IMcpServerConfiguration;
-}
+import { IMcpServerConfiguration } from './mcpPlatformTypes.js';
 
 export interface ILocalMcpServer {
 	readonly name: string;
 	readonly config: IMcpServerConfiguration;
 	readonly version: string;
-	readonly mcpResource: URI;
 	readonly location?: URI;
 	readonly id?: string;
 	readonly displayName?: string;
@@ -133,15 +118,6 @@ export interface IQueryOptions {
 	sortOrder?: SortOrder;
 }
 
-export const IMcpGalleryService = createDecorator<IMcpGalleryService>('IMcpGalleryService');
-export interface IMcpGalleryService {
-	readonly _serviceBrand: undefined;
-	isEnabled(): boolean;
-	query(options?: IQueryOptions, token?: CancellationToken): Promise<IGalleryMcpServer[]>;
-	getManifest(extension: IGalleryMcpServer, token: CancellationToken): Promise<IMcpServerManifest>;
-	getReadme(extension: IGalleryMcpServer, token: CancellationToken): Promise<string>;
-}
-
 export interface InstallMcpServerEvent {
 	readonly name: string;
 	readonly source?: IGalleryMcpServer;
@@ -171,19 +147,14 @@ export interface DidUninstallMcpServerEvent {
 	readonly workspaceScoped?: boolean;
 }
 
-export type InstallOptions = {
-	packageType?: PackageType;
-	mcpResource?: URI;
-};
-
-export type UninstallOptions = {
-	mcpResource?: URI;
-};
 
-export interface IMcpServer {
-	name: string;
-	config: IMcpServerConfiguration;
-	inputs?: IMcpServerVariable[];
+export const IMcpGalleryService = createDecorator<IMcpGalleryService>('IMcpGalleryService');
+export interface IMcpGalleryService {
+	readonly _serviceBrand: undefined;
+	isEnabled(): boolean;
+	query(options?: IQueryOptions, token?: CancellationToken): Promise<IGalleryMcpServer[]>;
+	getManifest(extension: IGalleryMcpServer, token: CancellationToken): Promise<IMcpServerManifest>;
+	getReadme(extension: IGalleryMcpServer, token: CancellationToken): Promise<string>;
 }
 
 export const IMcpManagementService = createDecorator<IMcpManagementService>('IMcpManagementService');
@@ -193,10 +164,9 @@ export interface IMcpManagementService {
 	readonly onDidInstallMcpServers: Event<readonly InstallMcpServerResult[]>;
 	readonly onUninstallMcpServer: Event<UninstallMcpServerEvent>;
 	readonly onDidUninstallMcpServer: Event<DidUninstallMcpServerEvent>;
-	getInstalled(mcpResource?: URI): Promise<ILocalMcpServer[]>;
-	install(server: IMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
-	installFromGallery(server: IGalleryMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
-	uninstall(server: ILocalMcpServer, options?: UninstallOptions): Promise<void>;
+	getInstalled(): Promise<ILocalMcpServer[]>;
+	installFromGallery(server: IGalleryMcpServer, packageType: PackageType): Promise<void>;
+	uninstall(server: ILocalMcpServer): Promise<void>;
 }
 
 export const mcpGalleryServiceUrlConfig = 'chat.mcp.gallery.serviceUrl';
diff --git a/src/vs/platform/mcp/common/mcpManagementCli.ts b/src/vs/platform/mcp/common/mcpManagementCli.ts
@@ -3,32 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { ILogger } from '../../log/common/log.js';
-import { IMcpServerConfiguration } from './mcpPlatformTypes.js';
-import { IMcpManagementService } from './mcpManagement.js';
+import { IMcpConfiguration, IMcpConfigurationHTTP, IMcpConfigurationStdio, McpConfigurationServer } from './mcpPlatformTypes.js';
 
-type ValidatedConfig = { name: string; config: IMcpServerConfiguration };
+type ValidatedConfig = { name: string; config: IMcpConfigurationStdio | IMcpConfigurationHTTP };
 
 export class McpManagementCli {
 	constructor(
 		private readonly _logger: ILogger,
-		@IMcpManagementService private readonly _mcpManagementService: IMcpManagementService,
+		@IConfigurationService private readonly _userConfigurationService: IConfigurationService,
 	) { }
 
 	async addMcpDefinitions(
 		definitions: string[],
 	) {
 		const configs = definitions.map((config) => this.validateConfiguration(config));
-		await this.updateMcpInResource(configs);
+		await this.updateMcpInConfig(this._userConfigurationService, configs);
 		this._logger.info(`Added MCP servers: ${configs.map(c => c.name).join(', ')}`);
 	}
 
-	private async updateMcpInResource(configs: ValidatedConfig[]) {
-		await Promise.all(configs.map(({ name, config }) => this._mcpManagementService.install({ name, config })));
+	private async updateMcpInConfig(service: IConfigurationService, configs: ValidatedConfig[]) {
+		const mcp = service.getValue<IMcpConfiguration>('mcp') || { servers: {} };
+		mcp.servers ??= {};
+
+		for (const config of configs) {
+			mcp.servers[config.name] = config.config;
+		}
+
+		await service.updateValue('mcp', mcp);
 	}
 
 	private validateConfiguration(config: string): ValidatedConfig {
-		let parsed: IMcpServerConfiguration & { name: string };
+		let parsed: McpConfigurationServer & { name: string };
 		try {
 			parsed = JSON.parse(config);
 		} catch (e) {
@@ -44,7 +51,7 @@ export class McpManagementCli {
 		}
 
 		const { name, ...rest } = parsed;
-		return { name, config: rest as IMcpServerConfiguration };
+		return { name, config: rest as IMcpConfigurationStdio | IMcpConfigurationHTTP };
 	}
 }
 

diff --git a/src/vs/platform/mcp/common/mcpManagementIpc.ts b/src/vs/platform/mcp/common/mcpManagementIpc.ts