[pull] main from microsoft:main

.github/skills/code-oss-logs/SKILL.md

@@ -12,7 +12,7 @@ Find and display logs from the most recent Code OSS or Agents app dev run.
 | App | Default User Data Dir | Logs Path |
 |-----|-----------------------|-----------|
 | Code OSS | `$HOME/.vscode-oss-dev` | `$HOME/.vscode-oss-dev/logs/` |
-| Agents app | `$HOME/.vscode-oss-agents-dev` | `$HOME/.vscode-oss-agents-dev/logs/` |
+| Agents app | `$HOME/.vscode-oss-dev` | `$HOME/.vscode-oss-dev/logs/` |
 
 If Code OSS was launched with `--user-data-dir=<dir>`, use `<dir>/logs/` instead of the defaults above. Launch and debugging helpers often create temporary user data dirs under `.build/`; always prefer the exact user data dir from the launch command when it is known.
 
@@ -24,8 +24,6 @@ Each run creates a timestamped folder like `20260330T163430`. The most recent fo
 2. **Find the most recent log folder**:
     ```bash
     ls -lt "$HOME/.vscode-oss-dev/logs" | head -5
-    # or for the Agents app:
-    ls -lt "$HOME/.vscode-oss-agents-dev/logs" | head -5
     # or for a custom user data dir:
     ls -lt "<user-data-dir>/logs" | head -5
     ```

.github/workflows/component-fixtures.yml

@@ -2,7 +2,9 @@ name: Component Fixtures
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - 'release/*'
   pull_request:
     branches:
       - main

.vscode/launch.json

@@ -321,7 +321,7 @@
 				"--disable-extension=vscode.vscode-api-tests",
 				"--agents"
 			],
-			"userDataDir": "${userHome}/.vscode-oss-agents-dev",
+			"userDataDir": "${userHome}/.vscode-oss-dev",
 			"webRoot": "${workspaceFolder}",
 			"cascadeTerminateToConfigurations": [
 				"Attach to Extension Host"

.vscode/tasks.json

@@ -265,8 +265,8 @@
 			},
 			"args": [
 				"--agents",
-				"--user-data-dir=${userHome}/.vscode-oss-sessions-dev",
-				"--extensions-dir=${userHome}/.vscode-oss-sessions-dev/extensions"
+				"--user-data-dir=${userHome}/.vscode-oss-dev",
+				"--extensions-dir=${userHome}/.vscode-oss-dev/extensions"
 			],
 			"problemMatcher": []
 		},

extensions/copilot/package.json

@@ -6707,7 +6707,7 @@
 		"@anthropic-ai/claude-agent-sdk": "0.2.112",
 		"@anthropic-ai/sdk": "^0.82.0",
 		"@github/blackbird-external-ingest-utils": "^0.3.0",
-		"@github/copilot": "^1.0.39",
+		"@github/copilot": "1.0.39",
 		"@google/genai": "^1.22.0",
 		"@humanwhocodes/gitignore-to-minimatch": "1.0.2",
 		"@microsoft/tiktokenizer": "^1.0.10",

extensions/copilot/src/extension/chatInputNotification/vscode-node/chatInputNotification.contribution.ts

@@ -272,14 +272,10 @@ export class ChatInputNotificationContribution extends Disposable {
 			];
 		} else if (isManagedPlan) {
 			notification.description = vscode.l10n.t('Contact your admin to increase your limits.');
-			notification.actions = [
-				{ label: vscode.l10n.t('View Usage'), commandId: 'workbench.action.chat.openCopilotStatus' },
-			];
+			notification.actions = [];
 		} else if (this._chatQuotaService.additionalUsageEnabled) {
 			notification.description = vscode.l10n.t('Additional budget is enabled to cover extra usage.');
-			notification.actions = [
-				{ label: vscode.l10n.t('View Usage'), commandId: 'workbench.action.chat.openCopilotStatus' },
-			];
+			notification.actions = [];
 		} else {
 			notification.description = vscode.l10n.t('Set additional budget to cover extra usage.');
 			notification.actions = [

extensions/copilot/src/extension/conversation/vscode-node/languageModelAccess.ts

@@ -276,17 +276,6 @@ export class LanguageModelAccess extends Disposable implements IExtensionContrib
 				modelTooltip = getModelCapabilitiesDescription(endpoint);
 			}
 
-			let modelCategory: { label: string; order: number } | undefined;
-			if (endpoint instanceof AutoChatEndpoint) {
-				modelCategory = { label: '', order: Number.MIN_SAFE_INTEGER };
-			} else if (endpoint.isPremium === undefined || this._authenticationService.copilotToken?.isFreeUser) {
-				modelCategory = { label: vscode.l10n.t("Copilot Models"), order: 0 };
-			} else if (endpoint.isPremium) {
-				modelCategory = { label: vscode.l10n.t("Premium Models"), order: 1 };
-			} else {
-				modelCategory = { label: vscode.l10n.t("Standard Models"), order: 0 };
-			}
-
 			// Counting tokens requires instantiating the tokenizers, which makes this process use a lot of memory.
 			// Let's cache the results across extension activations
 			const baseCount = await this._promptBaseCountCache.getBaseCount(endpoint);
@@ -304,7 +293,6 @@ export class LanguageModelAccess extends Disposable implements IExtensionContrib
 				const customModel = endpoint.customModel;
 				modelDetail = customModel.owner_name;
 				modelTooltip = vscode.l10n.t('{0} is contributed by {1} using {2}.', sanitizedModelName, customModel.owner_name, customModel.key_name);
-				modelCategory = { label: vscode.l10n.t("Custom Models"), order: 2 };
 			}
 
 			const session = this._authenticationService.anyGitHubSession;
@@ -322,7 +310,6 @@ export class LanguageModelAccess extends Disposable implements IExtensionContrib
 				multiplierNumeric: endpoint instanceof AutoChatEndpoint ? undefined : endpoint.multiplier,
 				priceCategory: endpoint instanceof AutoChatEndpoint ? undefined : endpoint.priceCategory,
 				detail: modelDetail,
-				category: modelCategory,
 				statusIcon: endpoint.degradationReason ? new vscode.ThemeIcon('warning') : undefined,
 				version: endpoint.version,
 				maxInputTokens: endpoint.modelMaxPromptTokens - baseCount - BaseTokensPerCompletion,

extensions/copilot/src/extension/prompts/node/agent/allAgentPrompts.ts

@@ -20,6 +20,7 @@ import './openai/gpt54Prompt';
 import './openai/gpt55Prompt';
 import './openai/gpt5CodexPrompt';
 import './openai/gpt5Prompt';
+import './openai/hiddenModelMPrompt';
 import './xAIPrompts';
 import './zaiPrompts';