[pull] main from microsoft:main

.github/prompts/find-duplicates.prompt.md

@@ -1,6 +1,6 @@
 ---
 # NOTE: This prompt is intended for internal use only for now.
-agent: Engineering
+agent: agent
 argument-hint: Provide a link or issue number to find duplicates for
 description: Find duplicates for a VS Code GitHub issue
 model: Claude Sonnet 4.5 (copilot)
@@ -12,5 +12,5 @@ tools:
 ---
 
 ## Your Task
-1. Use the GitHub MCP server to retrieve the prompt file https://github.com/microsoft/vscode-engineering/blob/main/.github/prompts/find-duplicates-gh-cli.prompt.md.
+1. Get the file contents of the prompt file https://github.com/microsoft/vscode-engineering/blob/main/.github/prompts/find-duplicates-gh-cli.prompt.md.
 2. Follow those instructions PRECISELY to identify potential duplicate issues for a given issue number in the VS Code repository.

.github/prompts/find-issue.prompt.md

@@ -1,6 +1,6 @@
 ---
 # ⚠️: Internal use only. To onboard, follow instructions at https://github.com/microsoft/vscode-engineering/blob/main/docs/gh-mcp-onboarding.md
-agent: Engineering
+agent: agent
 model: Claude Sonnet 4.5 (copilot)
 argument-hint: Describe your issue. Include relevant keywords or phrases.
 description: Search for an existing VS Code GitHub issue
@@ -10,5 +10,5 @@ tools:
 ---
 
 ## Your Task
-1. Use the GitHub MCP server to retrieve the prompt file https://github.com/microsoft/vscode-engineering/blob/main/.github/prompts/find-issue.prompt.md.
+1. Get the file contents of the prompt file https://github.com/microsoft/vscode-engineering/blob/main/.github/prompts/find-issue.prompt.md.
 2. Follow those instructions PRECISELY to find issues related to the issue description provided. Perform your search in the `vscode` repository.

.github/prompts/issue-grouping.prompt.md

@@ -1,5 +1,5 @@
 ---
-agent: Engineering
+agent: agent
 model: Claude Sonnet 4.5 (copilot)
 argument-hint: Give an assignee and or a label/labels. Issues with that assignee and label will be fetched and grouped.
 description: Group similar issues.

.gitignore

@@ -6,7 +6,6 @@ node_modules/
 .build/
 .vscode/extensions/**/out/
 extensions/**/dist/
-src/vs/base/browser/ui/codicons/codicon/codicon.ttf
 /out*/
 /extensions/**/out/
 build/node_modules

build/azure-pipelines/product-build-macos.yml

@@ -43,7 +43,7 @@ name: "$(Date:yyyyMMdd).$(Rev:r) (${{ parameters.VSCODE_QUALITY }})"
 
 resources:
   repositories:
-    - repository: 1ESPipelines
+    - repository: 1esPipelines
       type: git
       name: 1ESPipelineTemplates/1ESPipelineTemplates
       ref: refs/tags/release

build/azure-pipelines/product-build.yml

@@ -163,7 +163,7 @@ resources:
       source: 'VS Code 7PM Kick-Off'
       trigger: true
   repositories:
-    - repository: 1ESPipelines
+    - repository: 1esPipelines
       type: git
       name: 1ESPipelineTemplates/1ESPipelineTemplates
       ref: refs/tags/release

build/azure-pipelines/product-sanity-tests.yml

@@ -37,7 +37,7 @@ name: "$(Date:yyyyMMdd).$(Rev:r) (${{ parameters.BUILD_QUALITY }} ${{ parameters
 
 resources:
   repositories:
-    - repository: 1ESPipelines
+    - repository: 1esPipelines
       type: git
       name: 1ESPipelineTemplates/1ESPipelineTemplates
       ref: refs/tags/release

build/gulpfile.editor.ts

@@ -36,14 +36,6 @@ const BUNDLED_FILE_HEADER = [
 ].join('\n');
 
 const extractEditorSrcTask = task.define('extract-editor-src', () => {
-	// Ensure codicon.ttf is copied from node_modules (needed when node_modules is cached and postinstall doesn't run)
-	const codiconSource = path.join(root, 'node_modules', '@vscode', 'codicons', 'dist', 'codicon.ttf');
-	const codiconDest = path.join(root, 'src', 'vs', 'base', 'browser', 'ui', 'codicons', 'codicon', 'codicon.ttf');
-	if (fs.existsSync(codiconSource)) {
-		fs.mkdirSync(path.dirname(codiconDest), { recursive: true });
-		fs.copyFileSync(codiconSource, codiconDest);
-	}
-
 	const apiusages = monacoapi.execute().usageContent;
 	const extrausages = fs.readFileSync(path.join(root, 'build', 'monaco', 'monaco.usage.recipe')).toString();
 	standalone.extractEditor({

build/npm/postinstall.ts

@@ -184,21 +184,3 @@ for (const dir of dirs) {
 
 child_process.execSync('git config pull.rebase merges');
 child_process.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
-
-// Copy codicon.ttf from @vscode/codicons package
-const codiconSource = path.join(root, 'node_modules', '@vscode', 'codicons', 'dist', 'codicon.ttf');
-const codiconDest = path.join(root, 'src', 'vs', 'base', 'browser', 'ui', 'codicons', 'codicon', 'codicon.ttf');
-
-if (!fs.existsSync(codiconSource)) {
-	console.error(`ERR codicon.ttf not found at ${codiconSource}`);
-	process.exit(1);
-}
-
-try {
-	fs.mkdirSync(path.dirname(codiconDest), { recursive: true });
-	fs.copyFileSync(codiconSource, codiconDest);
-	log('.', `Copied codicon.ttf to ${codiconDest}`);
-} catch (error) {
-	console.error(`ERR Failed to copy codicon.ttf from ${codiconSource} to ${codiconDest}:`, error);
-	process.exit(1);
-}

extensions/r/package.json

@@ -17,9 +17,9 @@
       {
         "id": "r",
         "extensions": [
-          ".r",
-          ".rhistory",
-          ".rprofile",
+          ".R",
+          ".Rhistory",
+          ".Rprofile",
           ".rt"
         ],
         "aliases": [

package.json

@@ -78,7 +78,6 @@
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "^2.5.4",
     "@types/semver": "^7.5.8",
-    "@vscode/codicons": "^0.0.44",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/native-watchdog": "^1.4.6",

remote/web/package.json

@@ -5,7 +5,6 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
-    "@vscode/codicons": "^0.0.44",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.21",

src/vs/base/browser/ui/tree/abstractTree.ts

@@ -29,6 +29,7 @@ import { Emitter, Event, EventBufferer, Relay } from '../../../common/event.js';
 import { fuzzyScore, FuzzyScore } from '../../../common/filters.js';
 import { KeyCode } from '../../../common/keyCodes.js';
 import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../common/lifecycle.js';
+import { isMacintosh } from '../../../common/platform.js';
 import { clamp } from '../../../common/numbers.js';
 import { ScrollEvent } from '../../../common/scrollable.js';
 import './media/tree.css';
@@ -3242,6 +3243,17 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		this.onDidChangeCollapseStateRelay.input = model.onDidChangeCollapseState;
 		this.onDidChangeRenderNodeCountRelay.input = model.onDidChangeRenderNodeCount;
 		this.onDidSpliceModelRelay.input = model.onDidSpliceModel;
+
+		// Announce collapse state changes for screen readers (VoiceOver doesn't reliably
+		// announce aria-expanded changes on already-focused elements)
+		if (isMacintosh) {
+			this.modelDisposables.add(model.onDidChangeCollapseState(e => {
+				const { node, deep } = e;
+				if (node.collapsible && !deep && this.isDOMFocused()) {
+					alert(node.collapsed ? localize('treeNodeCollapsed', "collapsed") : localize('treeNodeExpanded', "expanded"));
+				}
+			}));
+		}
 	}
 
 	navigate(start?: TRef): ITreeNavigator<T> {

src/vs/editor/browser/services/renameSymbolTrackerService.ts

@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IObservable, observableValue } from '../../../base/common/observable.js';
+import { Position } from '../../common/core/position.js';
+import { Range } from '../../common/core/range.js';
+import { ITextModel } from '../../common/model.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+
+export const IRenameSymbolTrackerService = createDecorator<IRenameSymbolTrackerService>('renameSymbolTrackerService');
+
+/**
+ * Represents a tracked word that is being edited by the user.
+ */
+export interface ITrackedWord {
+	/**
+	 * The model in which the word is being tracked.
+	 */
+	readonly model: ITextModel;
+	/**
+	 * The original word text when tracking started.
+	 */
+	readonly originalWord: string;
+	/**
+	 * The original position where the word was found.
+	 */
+	readonly originalPosition: Position;
+	/**
+	 * The original range of the word when tracking started.
+	 */
+	readonly originalRange: Range;
+	/**
+	 * The current word text after edits.
+	 */
+	readonly currentWord: string;
+	/**
+	 * The current range of the word after edits.
+	 */
+	readonly currentRange: Range;
+}
+
+export interface IRenameSymbolTrackerService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Observable that emits the currently tracked word, or undefined if no word is being tracked.
+	 */
+	readonly trackedWord: IObservable<ITrackedWord | undefined>;
+}
+
+export class NullRenameSymbolTrackerService implements IRenameSymbolTrackerService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _trackedWord = observableValue<ITrackedWord | undefined>(this, undefined);
+	public readonly trackedWord: IObservable<ITrackedWord | undefined> = this._trackedWord;
+	constructor() {
+		this._trackedWord.set(undefined, undefined);
+	}
+}