[pull] main from microsoft:main

.vscode/settings.json

@@ -100,10 +100,10 @@
 	// --- TypeScript ---
 	"typescript.experimental.useTsgo": true,
 	"typescript.tsdk": "node_modules/typescript/lib",
-	"typescript.preferences.importModuleSpecifier": "relative",
-	"typescript.preferences.quoteStyle": "single",
+	"js/ts.preferences.importModuleSpecifier": "relative",
+	"js/ts.preferences.quoteStyle": "single",
 	"typescript.tsc.autoDetect": "off",
-	"typescript.preferences.autoImportFileExcludePatterns": [
+	"js/ts.preferences.autoImportFileExcludePatterns": [
 		"@xterm/xterm",
 		"@xterm/headless",
 		"node-pty",
@@ -144,6 +144,9 @@
 		"ts": "warning",
 		"eslint": "warning"
 	},
+	"git.worktreeIncludeFiles": [
+		"product.overrides.json"
+	],
 	// --- GitHub ---
 	"githubPullRequests.experimental.createView": true,
 	"githubPullRequests.assignCreated": "${user}",
@@ -199,12 +202,11 @@
 		"sash"
 	],
 	// --- Workbench ---
-	// "application.experimental.rendererProfiling": true, // https://github.com/microsoft/vscode/issues/265654
 	"editor.aiStats.enabled": true, // Team selfhosting on ai stats
 	"azureMcp.enabledServices": [
 		"kusto" // Needed for kusto tool in data.prompt.md
 	],
 	"azureMcp.serverMode": "all",
 	"azureMcp.readOnly": true,
-	"debug.breakpointsView.presentation": "tree"
+	"debug.breakpointsView.presentation": "tree",
 }

build/gulpfile.vscode.ts

@@ -389,7 +389,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 
 		const isInsiderOrExploration = quality === 'insider' || quality === 'exploration';
 		const embedded = isInsiderOrExploration
-			? (product as typeof product & { embedded?: { nameShort: string; nameLong: string; applicationName: string; dataFolderName: string; darwinBundleIdentifier: string } }).embedded
+			? (product as typeof product & { embedded?: { nameShort: string; nameLong: string; applicationName: string; dataFolderName: string; darwinBundleIdentifier: string; urlProtocol: string } }).embedded
 			: undefined;
 
 		const packageSubJsonStream = isInsiderOrExploration
@@ -409,6 +409,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 					json.applicationName = embedded.applicationName;
 					json.dataFolderName = embedded.dataFolderName;
 					json.darwinBundleIdentifier = embedded.darwinBundleIdentifier;
+					json.urlProtocol = embedded.urlProtocol;
 					return json;
 				}))
 				.pipe(rename('product.sub.json'))

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.110.0",
-  "distro": "85914d5a600261a53306190177be48aa8f0cdfb4",
+  "distro": "bd187e4508a244500eb533c56e5cccb6801a699c",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -245,4 +245,4 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.6.1"
   }
-}
+}

src/vs/sessions/contrib/aiCustomizationManagement/browser/aiCustomizationManagementEditor.ts

@@ -247,7 +247,7 @@ export class AICustomizationManagementEditor extends EditorPane {
 			layout: (width, _, height) => {
 				this.sidebarContainer.style.width = `${width}px`;
 				if (height !== undefined) {
-					const listHeight = height - 24;
+					const listHeight = height - 8;
 					this.sectionsList.layout(listHeight, width);
 				}
 			},

src/vs/sessions/contrib/aiCustomizationManagement/browser/media/aiCustomizationManagement.css

@@ -9,20 +9,19 @@
 	flex-direction: column;
 	height: 100%;
 	overflow: hidden;
-	border-top: 1px solid var(--vscode-panel-border);
 }
 
 /* Sidebar */
 .ai-customization-management-editor .management-sidebar {
 	background-color: var(--vscode-sideBar-background);
 	height: 100%;
 	overflow: hidden;
-	border-right: 1px solid var(--vscode-panel-border);
 }
 
 .ai-customization-management-editor .sidebar-content {
 	height: 100%;
-	padding: 12px 0 12px 4px;
+	padding: 4px;
+	box-sizing: border-box;
 	display: flex;
 	flex-direction: column;
 }
@@ -41,7 +40,6 @@
 	padding: 4px 8px;
 	gap: 10px;
 	cursor: pointer;
-	margin: 1px 6px;
 	border-radius: 4px;
 	transition: background-color 0.1s ease, opacity 0.1s ease;
 }

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

@@ -3,14 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { URI } from '../../../base/common/uri.js';
-import { IGitExtensionService, IGitService } from '../../contrib/git/common/gitService.js';
+import { IGitExtensionDelegate, IGitService, GitRef, GitRefQuery, GitRefType } from '../../contrib/git/common/gitService.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
-import { ExtHostContext, ExtHostGitExtensionShape, MainContext, MainThreadGitExtensionShape } from '../common/extHost.protocol.js';
+import { ExtHostContext, ExtHostGitExtensionShape, GitRefTypeDto, MainContext, MainThreadGitExtensionShape } from '../common/extHost.protocol.js';
+
+function toGitRefType(type: GitRefTypeDto): GitRefType {
+	switch (type) {
+		case GitRefTypeDto.Head: return GitRefType.Head;
+		case GitRefTypeDto.RemoteHead: return GitRefType.RemoteHead;
+		case GitRefTypeDto.Tag: return GitRefType.Tag;
+		default: throw new Error(`Unknown GitRefType: ${type}`);
+	}
+}
 
 @extHostNamedCustomer(MainContext.MainThreadGitExtension)
-export class MainThreadGitExtensionService extends Disposable implements MainThreadGitExtensionShape, IGitExtensionService {
+export class MainThreadGitExtensionService extends Disposable implements MainThreadGitExtensionShape, IGitExtensionDelegate {
 	private readonly _proxy: ExtHostGitExtensionShape;
 
 	constructor(
@@ -20,16 +30,35 @@ export class MainThreadGitExtensionService extends Disposable implements MainThr
 		super();
 
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostGitExtension);
-		gitService.setDelegate(this);
+		this._initializeDelegate();
+	}
+
+	private async _initializeDelegate(): Promise<void> {
+		// Check whether the vscode.git extension is available in the extension host
+		// process before setting the delegate. The delegate should only be set once,
+		// for the extension host process that runs the vscode.git extension
+		const isExtensionAvailable = await this._proxy.$isGitExtensionAvailable();
+
+		if (isExtensionAvailable && !this._store.isDisposed) {
+			this._register(this.gitService.setDelegate(this));
+		}
 	}
 
 	async openRepository(uri: URI): Promise<URI | undefined> {
 		const result = await this._proxy.$openRepository(uri);
 		return result ? URI.revive(result) : undefined;
 	}
 
-	override dispose(): void {
-		this.gitService.clearDelegate();
-		super.dispose();
+	async getRefs(root: URI, query: GitRefQuery, token?: CancellationToken): Promise<GitRef[]> {
+		const result = await this._proxy.$getRefs(root, query, token);
+
+		if (token?.isCancellationRequested) {
+			return [];
+		}
+
+		return result.map(ref => ({
+			...ref,
+			type: toGitRefType(ref.type)
+		} satisfies GitRef));
 	}
 }

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

@@ -3456,8 +3456,30 @@ export interface ExtHostChatSessionsShape {
 	$provideHandleOptionsChange(providerHandle: number, sessionResource: UriComponents, updates: ReadonlyArray<ChatSessionOptionUpdateDto>, token: CancellationToken): Promise<void>;
 }
 
+export interface GitRefQueryDto {
+	readonly contains?: string;
+	readonly count?: number;
+	readonly pattern?: string | string[];
+	readonly sort?: 'alphabetically' | 'committerdate' | 'creatordate';
+}
+
+export enum GitRefTypeDto {
+	Head,
+	RemoteHead,
+	Tag
+}
+
+export interface GitRefDto {
+	readonly id: string;
+	readonly name: string;
+	readonly type: GitRefTypeDto;
+	readonly revision: string;
+}
+
 export interface ExtHostGitExtensionShape {
+	$isGitExtensionAvailable(): Promise<boolean>;
 	$openRepository(root: UriComponents): Promise<UriComponents | undefined>;
+	$getRefs(root: UriComponents, query: GitRefQueryDto, token?: CancellationToken): Promise<GitRefDto[]>;
 }
 
 // --- proxy identifiers

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

@@ -10,12 +10,46 @@ import { ExtensionIdentifier } from '../../../platform/extensions/common/extensi
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { IExtHostExtensionService } from './extHostExtensionService.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
-import { ExtHostGitExtensionShape } from './extHost.protocol.js';
+import { ExtHostGitExtensionShape, GitRefDto, GitRefQueryDto, GitRefTypeDto } from './extHost.protocol.js';
 
 const GIT_EXTENSION_ID = 'vscode.git';
 
+function toGitRefTypeDto(type: GitRefType): GitRefTypeDto {
+	switch (type) {
+		case GitRefType.Head: return GitRefTypeDto.Head;
+		case GitRefType.RemoteHead: return GitRefTypeDto.RemoteHead;
+		case GitRefType.Tag: return GitRefTypeDto.Tag;
+		default: throw new Error(`Unknown GitRefType: ${type}`);
+	}
+}
+
+interface Repository {
+	readonly rootUri: vscode.Uri;
+	getRefs(query: GitRefQuery, token?: vscode.CancellationToken): Promise<GitRef[]>;
+}
+
+interface GitRef {
+	type: GitRefType;
+	name?: string;
+	commit?: string;
+	remote?: string;
+}
+
+const enum GitRefType {
+	Head,
+	RemoteHead,
+	Tag
+}
+
+interface GitRefQuery {
+	readonly contains?: string;
+	readonly count?: number;
+	readonly pattern?: string | string[];
+	readonly sort?: 'alphabetically' | 'committerdate' | 'creatordate';
+}
+
 interface GitExtensionAPI {
-	openRepository(root: vscode.Uri): Promise<{ readonly rootUri: vscode.Uri } | null>;
+	openRepository(root: vscode.Uri): Promise<Repository | null>;
 }
 
 interface GitExtension {
@@ -41,7 +75,10 @@ export class ExtHostGitExtensionService extends Disposable implements IExtHostGi
 		super();
 	}
 
-	// --- Called by the main thread via RPC (ExtHostGitShape) ---
+	async $isGitExtensionAvailable(): Promise<boolean> {
+		const registry = await this._extHostExtensionService.getExtensionRegistry();
+		return !!registry.getExtensionDescription(GIT_EXTENSION_ID);
+	}
 
 	async $openRepository(uri: UriComponents): Promise<UriComponents | undefined> {
 		const api = await this._ensureGitApi();
@@ -53,7 +90,43 @@ export class ExtHostGitExtensionService extends Disposable implements IExtHostGi
 		return repository?.rootUri;
 	}
 
-	// --- Private helpers ---
+	async $getRefs(uri: UriComponents, query: GitRefQueryDto, token?: vscode.CancellationToken): Promise<GitRefDto[]> {
+		const api = await this._ensureGitApi();
+		if (!api) {
+			return [];
+		}
+
+		const repository = await api.openRepository(URI.revive(uri));
+		if (!repository) {
+			return [];
+		}
+
+		try {
+			const refs = await repository.getRefs(query, token);
+			const result: (GitRefDto | undefined)[] = refs.map(ref => {
+				if (!ref.name || !ref.commit) {
+					return undefined;
+				}
+
+				const id = ref.type === GitRefType.Head
+					? `refs/heads/${ref.name}`
+					: ref.type === GitRefType.RemoteHead
+						? `refs/remotes/${ref.remote}/${ref.name}`
+						: `refs/tags/${ref.name}`;
+
+				return {
+					id,
+					name: ref.name,
+					type: toGitRefTypeDto(ref.type),
+					revision: ref.commit
+				} satisfies GitRefDto;
+			});
+
+			return result.filter(ref => !!ref);
+		} catch {
+			return [];
+		}
+	}
 
 	private async _ensureGitApi(): Promise<GitExtensionAPI | undefined> {
 		if (this._gitApi) {

src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts

@@ -181,7 +181,11 @@ abstract class SubmitAction extends Action2 {
 	}
 }
 
-const requestInProgressOrPendingToolCall = ContextKeyExpr.or(ChatContextKeys.requestInProgress, ChatContextKeys.Editing.hasToolConfirmation);
+const requestInProgressOrPendingToolCall = ContextKeyExpr.or(
+	ChatContextKeys.requestInProgress,
+	ChatContextKeys.Editing.hasToolConfirmation,
+	ChatContextKeys.Editing.hasQuestionCarousel,
+);
 const whenNotInProgress = ChatContextKeys.requestInProgress.negate();
 
 export class ChatSubmitAction extends SubmitAction {

src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuestionCarouselPart.ts

@@ -1054,20 +1054,10 @@ export class ChatQuestionCarouselPart extends Disposable implements IChatContent
 				const freeformTextarea = this._freeformTextareas.get(question.id);
 				const freeformValue = freeformTextarea?.value !== '' ? freeformTextarea?.value : undefined;
 
-				// Only include defaults if nothing selected AND no freeform input
-				let finalSelectedValues = selectedValues;
-				if (selectedValues.length === 0 && !freeformValue && question.defaultValue !== undefined) {
-					const defaultIds = Array.isArray(question.defaultValue)
-						? question.defaultValue
-						: [question.defaultValue];
-					const defaultValues = question.options
-						?.filter(opt => defaultIds.includes(opt.id))
-						.map(opt => opt.value);
-					finalSelectedValues = defaultValues?.filter(v => v !== undefined) || [];
-				}
-
-				if (freeformValue || finalSelectedValues.length > 0) {
-					return { selectedValues: finalSelectedValues, freeformValue };
+				// Return whatever was selected - defaults are applied at render time when
+				// checkboxes are initially checked, so empty selection means user unchecked all
+				if (freeformValue || selectedValues.length > 0) {
+					return { selectedValues, freeformValue };
 				}
 				return undefined;
 			}