[pull] main from microsoft:main

.github/CODENOTIFY

@@ -1,6 +1,5 @@
 # Base Utilities
 src/vs/base/common/oauth.ts @TylerLeonhardt
-src/vs/base/common/uri.ts @jrieken
 src/vs/base/browser/domSanitize.ts @mjbvz
 src/vs/base/parts/quickinput/** @TylerLeonhardt
 
@@ -18,13 +17,6 @@ src/vs/platform/quickinput/** @TylerLeonhardt
 src/vs/platform/secrets/** @TylerLeonhardt
 src/vs/platform/terminal/electron-main/** @anthonykim1
 src/vs/platform/terminal/node/** @anthonykim1
-src/vs/platform/actions/common/menuService.ts @jrieken
-src/vs/platform/instantiation/** @jrieken
-
-# Editor Core
-src/vs/editor/contrib/snippet/** @jrieken
-src/vs/editor/contrib/suggest/** @jrieken
-src/vs/editor/contrib/format/** @jrieken
 
 # Electron Main
 src/vs/code/** @deepak1556
@@ -74,9 +66,5 @@ extensions/git/** @lszomoru
 extensions/git-base/** @lszomoru
 extensions/github/** @lszomoru
 
-# Chat Editing, Inline Chat
-src/vs/workbench/contrib/chat/browser/chatEditing/** @jrieken
-src/vs/workbench/contrib/inlineChat/** @jrieken
-
 # Testing
 test/sanity/** @dmitrivMS

.github/CODEOWNERS

@@ -16,5 +16,5 @@ build/lib/policies/policyData.jsonc @joshspicer @rebornix @joaomoreno @pwang347
 # VS Code API
 # Ensure the API team is aware of changes to the vscode-dts file
 # this is only about the final API, not about proposed API changes
-src/vscode-dts/vscode.d.ts @jrieken @mjbvz @alexr00
-src/vs/workbench/services/extensions/common/extensionPoints.json @jrieken @mjbvz @alexr00
+src/vscode-dts/vscode.d.ts @mjbvz @alexr00
+src/vs/workbench/services/extensions/common/extensionPoints.json @mjbvz @alexr00

.github/classifier.json

@@ -6,24 +6,24 @@
 	},
 	"labels": {
 		"accessibility": { "assign": ["meganrogge"]},
-		"api": {"assign": ["jrieken"]},
+		"api": {"assign": []},
 		"api-finalization": {"assign": []},
-		"api-proposal": {"assign": ["jrieken"]},
+		"api-proposal": {"assign": []},
 		"authentication": {"assign": ["TylerLeonhardt"]},
-		"bisect-ext": {"assign": ["jrieken"]},
+		"bisect-ext": {"assign": []},
 		"bot-proposal": {"assign": ["lramos15"]},
 		"bracket-pair-colorization": {"assign": ["hediet"]},
 		"bracket-pair-guides": {"assign": ["hediet"]},
-		"breadcrumbs": {"assign": ["jrieken"]},
-		"callhierarchy": {"assign": ["jrieken"]},
+		"breadcrumbs": {"assign": []},
+		"callhierarchy": {"assign": []},
 		"chat-terminal": {"assign": ["meganrogge"]},
 		"chat-terminal-output-monitor": {"assign": ["meganrogge"]},
 		"chrome-devtools": {"assign": ["deepak1556"]},
 		"cloud-changes": {"assign": ["joyceerhl"]},
 		"code-cli": {"assign": ["connor4312"]},
-		"code-lens": {"assign": ["jrieken"]},
+		"code-lens": {"assign": []},
 		"code-server-web": {"assign": ["aeschli"]},
-		"command-center": {"assign": ["jrieken"]},
+		"command-center": {"assign": []},
 		"comments": {"assign": ["alexr00"]},
 		"config": {"assign": ["sandy081"]},
 		"containers": {"assign": ["chrmarti"]},
@@ -58,7 +58,7 @@
 		"editor-indent-guides": {"assign": ["hediet"]},
 		"editor-input": {"assign": ["aiday-mar"]},
 		"editor-input-IME": {"assign": ["aiday-mar"]},
-		"editor-insets": {"assign": ["jrieken"]},
+		"editor-insets": {"assign": []},
 		"editor-minimap": {"assign": ["alexdima"]},
 		"editor-multicursor": {"assign": ["alexdima"]},
 		"editor-parameter-hints": {"assign": ["mjbvz"]},
@@ -68,7 +68,7 @@
 		"editor-scrollbar": {"assign": ["alexdima"]},
 		"editor-sorting": {"assign": ["alexdima"]},
 		"editor-sticky-scroll": {"assign": ["aiday-mar"]},
-		"editor-symbols": {"assign": ["jrieken"]},
+		"editor-symbols": {"assign": []},
 		"editor-synced-region": {"assign": ["aeschli"]},
 		"editor-textbuffer": {"assign": ["alexdima", "rebornix"]},
 		"editor-theming": {"assign": ["alexdima"]},
@@ -83,15 +83,15 @@
 		"extension-recommendations": {"assign": ["sandy081"]},
 		"extensions": {"assign": ["sandy081"]},
 		"extensions-development": {"assign": []},
-		"file-decorations": {"assign": ["jrieken"]},
+		"file-decorations": {"assign": []},
 		"file-encoding": {"assign": ["bpasero"]},
 		"file-explorer": {"assign": ["lramos15"]},
 		"file-glob": {"assign": ["bpasero"]},
 		"file-io": {"assign": ["bpasero"]},
 		"file-nesting": {"assign": ["lramos15"]},
 		"file-watcher": {"assign": ["bpasero"]},
 		"font-rendering": {"assign": ["rzhao271"]},
-		"formatting": {"assign": ["jrieken"]},
+		"formatting": {"assign": []},
 		"getting-started": {"assign": ["bhavyaus"]},
 		"ghost-text": {"assign": ["hediet"]},
 		"git": {"assign": ["lszomoru"]},
@@ -105,7 +105,7 @@
 		"icon-brand": {"assign": ["daviddossett"]},
 		"icons-product": {"assign": ["daviddossett"]},
 		"image-preview": {"assign": ["mjbvz"]},
-		"inlay-hints": {"assign": ["jrieken", "hediet"]},
+		"inlay-hints": {"assign": ["hediet"]},
 		"inline-completions": {"assign": ["hediet"]},
 		"install-update": {"assign": ["joaomoreno"], "accuracy": 0.85},
 		"intellisense-config": {"assign": ["rzhao271"]},
@@ -124,7 +124,7 @@
 		"l10n-platform": {"assign": ["TylerLeonhardt"]},
 		"label-provider": {"assign": ["lramos15"]},
 		"languages-basic": {"assign": ["aeschli"]},
-		"languages-diagnostics": {"assign": ["jrieken"]},
+		"languages-diagnostics": {"assign": []},
 		"languages-guessing": {"assign": ["TylerLeonhardt"]},
 		"layout": {"assign": ["benibenj"]},
 		"lcd-text-rendering": {"assign": []},
@@ -136,7 +136,7 @@
 		"menus": {"assign": ["sbatten"]},
 		"merge-conflict": {"assign": ["chrmarti"]},
 		"merge-editor": {"assign": ["hediet"]},
-		"merge-editor-workbench": {"assign": ["jrieken"]},
+		"merge-editor-workbench": {"assign": []},
 		"monaco-editor": {"assign": []},
 		"native-file-dialog": {"assign": ["deepak1556"]},
 		"network": {"assign": ["deepak1556"]},
@@ -179,7 +179,7 @@
 		"notebook-workflow": {"assign": []},
 		"open-editors": {"assign": ["lramos15"]},
 		"opener": {"assign": ["mjbvz"]},
-		"outline": {"assign": ["jrieken"]},
+		"outline": {"assign": []},
 		"output": {"assign": ["sandy081"]},
 		"perf": {"assign": []},
 		"perf-bloat": {"assign": []},
@@ -189,13 +189,13 @@
 		"proxy": {"assign": ["chrmarti"]},
 		"quick-open": {"assign": ["TylerLeonhardt"]},
 		"quick-pick": {"assign": ["TylerLeonhardt"]},
-		"references-viewlet": {"assign": ["jrieken"]},
+		"references-viewlet": {"assign": []},
 		"release-notes": {"assign": []},
 		"remote": {"assign": []},
 		"remote-connection": {"assign": ["alexdima"]},
 		"remote-explorer": {"assign": ["alexr00"]},
 		"remote-tunnel": {"assign": ["aeschli", "connor4312"]},
-		"rename": {"assign": ["jrieken"]},
+		"rename": {"assign": []},
 		"runCommands": {"assign": ["ulugbekna"]},
 		"sandbox": {"assign": ["deepak1556"]},
 		"sash-widget": {"assign": ["joaomoreno"]},
@@ -213,11 +213,11 @@
 		"settings-sync-server": {"assign": ["rzhao271"]},
 		"shared-process": {"assign": []},
 		"simple-file-dialog": {"assign": ["alexr00"]},
-		"smart-select": {"assign": ["jrieken"]},
+		"smart-select": {"assign": []},
 		"snap": {"assign": ["deepak1556"]},
-		"snippets": {"assign": ["jrieken"]},
+		"snippets": {"assign": []},
 		"splitview-widget": {"assign": ["joaomoreno"]},
-		"suggest": {"assign": ["jrieken"]},
+		"suggest": {"assign": []},
 		"table-widget": {"assign": ["joaomoreno"]},
 		"tasks": {"assign": ["meganrogge"], "accuracy": 0.85},
 		"telemetry": {"assign": ["lramos15"]},
@@ -263,11 +263,11 @@
 		"tree-sticky-scroll": {"assign": ["benibenj"]},
 		"tree-views": {"assign": ["alexr00"]},
 		"tree-widget": {"assign": ["joaomoreno"]},
-		"typehierarchy": {"assign": ["jrieken"]},
+		"typehierarchy": {"assign": []},
 		"typescript": {"assign": ["mjbvz"]},
 		"undo-redo": {"assign": ["alexdima"]},
 		"unicode-highlight": {"assign": ["hediet"]},
-		"uri": {"assign": ["jrieken"]},
+		"uri": {"assign": []},
 		"user-profiles": {"assign": ["sandy081"]},
 		"ux": {"assign": ["daviddossett"]},
 		"variable-resolving": {"assign": ["alexr00"]},
@@ -299,7 +299,7 @@
 		"workbench-multiroot": {"assign": ["bpasero"]},
 		"workbench-notifications": {"assign": ["bpasero"]},
 		"workbench-os-integration": {"assign": ["bpasero"]},
-		"workbench-rapid-render": {"assign": ["jrieken"]},
+		"workbench-rapid-render": {"assign": []},
 		"workbench-run-as-admin": {"assign": ["bpasero"]},
 		"workbench-state": {"assign": ["bpasero"]},
 		"workbench-status": {"assign": ["bpasero"]},
@@ -311,7 +311,7 @@
 		"workbench-window": {"assign": ["bpasero"]},
 		"workbench-workspace": {"assign": []},
 		"workbench-zen": {"assign": ["benibenj"]},
-		"workspace-edit": {"assign": ["jrieken"]},
+		"workspace-edit": {"assign": []},
 		"workspace-symbols": {"assign": []},
 		"workspace-trust": {"assign": ["lszomoru", "sbatten"]},
 		"zoom": {"assign": ["alexdima"] }

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

@@ -1,7 +1,7 @@
 jobs:
   - job: Web
     displayName: Web
-    timeoutInMinutes: 30
+    timeoutInMinutes: 45
     pool:
       name: 1es-ubuntu-22.04-x64
       os: linux

build/lib/stylelint/vscode-known-variables.json

@@ -1041,6 +1041,7 @@
 		"--animation-angle",
 		"--animation-opacity",
 		"--chat-input-anim-angle",
+		"--chat-input-anim-duration",
 		"--chat-send-button-anim-angle",
 		"--chat-setup-dialog-glow-angle",
 		"--vscode-chat-font-family",

extensions/copilot/package.json

@@ -4268,16 +4268,6 @@
 							"experimental"
 						]
 					},
-					"github.copilot.chat.inlineChat.selectionRatioThreshold": {
-						"type": "number",
-						"default": 0,
-						"markdownDescription": "%github.copilot.config.inlineChat.selectionRatioThreshold%",
-						"tags": [
-							"advanced",
-							"experimental",
-							"onExp"
-						]
-					},
 					"github.copilot.chat.inlineChat.reasoningEffort": {
 						"type": "string",
 						"default": "low",

extensions/copilot/package.nls.json

@@ -375,7 +375,6 @@
 	"github.copilot.config.notebook.alternativeNESFormat.enabled": "Enable alternative format for Next Edit Suggestions in notebooks.",
 	"github.copilot.config.localWorkspaceRecording.enabled": "Enable local workspace recording for analysis.",
 	"github.copilot.config.editRecording.enabled": "Enable edit recording for analysis.",
-	"github.copilot.config.inlineChat.selectionRatioThreshold": "Threshold at which to switch editing strategies for inline chat. When a selection portion of code matches a parse tree node, only that is presented to the language model. This speeds up response times but might have lower quality results. Requires having a parse tree for the document and the `inlineChat.enableV2` setting. Values must be between 0 and 1, where 0 means off and 1 means the selection perfectly matches a parse tree node.",
 	"github.copilot.config.inlineChat.reasoningEffort": "Controls the reasoning effort level for inline chat requests. Lower values result in faster responses with fewer reasoning tokens. Supported values depend on the model.",
 	"github.copilot.config.inlineChat.enableThinking": "Controls whether thinking/reasoning is enabled for inline chat requests. When disabled, reasoning summaries are suppressed for faster responses.",
 	"github.copilot.config.debug.requestLogger.maxEntries": "Maximum number of entries to keep in the request logger for debugging purposes.",

extensions/copilot/src/extension/chatSessions/copilotcli/node/copilotCli.ts

@@ -278,6 +278,8 @@ export interface CLIAgentInfo {
 	readonly agent: Readonly<SweCustomAgent>;
 	/** File URI for prompt-file agents, synthetic `copilotcli:` URI for SDK-only agents. */
 	readonly sourceUri: URI;
+	readonly extensionId?: string;
+	readonly pluginUri?: URI;
 }
 
 export interface ICopilotCLIAgents {

extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLICustomizationProvider.ts

@@ -189,6 +189,8 @@ export class CopilotCLICustomizationProvider extends Disposable implements vscod
 			uri: s.uri,
 			type: vscode.ChatSessionCustomizationType.Skill,
 			name: s.name,
+			extensionId: s.extensionId,
+			pluginUri: s.pluginUri,
 		}));
 	}
 

extensions/copilot/src/extension/conversation/common/languageModelAccess.ts

@@ -32,23 +32,21 @@ export function getModelCapabilitiesDescription(endpoint: IChatEndpoint | Langua
 	// GPT models
 	if (family.includes('gpt') || name.includes('gpt') || family.includes('codex') || name.includes('codex')) {
 		if (name.includes('codex') || family.includes('codex')) {
-			if (name.includes('max')) {
-				return l10n.t('Maximum capability Codex model optimized for complex multi-file refactoring and large codebase understanding.');
-			}
-			if (name.includes('mini')) {
-				return l10n.t('Lightweight Codex model for quick code completions and simple edits with low latency.');
-			}
 			return l10n.t('OpenAI Codex model specialized for code generation, debugging, and software development tasks.');
 		}
+		if (name.includes('mini')) {
+			return l10n.t('Lightweight GPT model for quick responses and simple tasks with low latency.');
+		}
+		if (name.includes('copilot')) {
+			return l10n.t('GPT model fine-tuned for Copilot code completions.');
+		}
 		if (name.includes('4o')) {
 			return l10n.t('Optimized GPT-4 model with faster responses and multimodal capabilities.');
 		}
-		if (name.includes('4.1') || name.includes('4-1')) {
+		if (name.includes('4.1')) {
 			return l10n.t('Enhanced GPT-4 model with improved instruction following and coding performance.');
 		}
-		if (name.includes('4')) {
-			return l10n.t('Reliable GPT-4 model suitable for a wide range of coding and general tasks.');
-		}
+		return l10n.t('OpenAI GPT model for coding and general assistance.');
 	}
 
 	// Gemini models
@@ -62,12 +60,9 @@ export function getModelCapabilitiesDescription(endpoint: IChatEndpoint | Langua
 		return l10n.t('Google Gemini model with balanced performance for coding and general assistance.');
 	}
 
-	// o1/o3 reasoning models
-	if (family.includes('o1') || family.includes('o3') || name.includes('o1') || name.includes('o3')) {
-		if (name.includes('mini')) {
-			return l10n.t('Compact reasoning model for quick problem-solving with step-by-step thinking.');
-		}
-		return l10n.t('Advanced reasoning model that excels at complex problem-solving, math, and coding challenges.');
+	// Grok models
+	if (family.includes('grok') || name.includes('grok')) {
+		return l10n.t('xAI Grok model optimized for fast code generation and development tasks.');
 	}
 
 	return undefined;