@codingame/monaco-vscode-chat-service-override 34.1.3 → 35.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/chat.shared.contribution.js

@@ -7,12 +7,14 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { PolicyCategory } from '@codingame/monaco-vscode-api/vscode/vs/base/common/policy';
 import '../../../../platform/agentHost/common/agentHost.config.contribution.js';
+import '../../../../platform/agentHost/browser/agentHost.config.contribution.js';
 import '../../../../platform/agentHost/common/agentHostStarter.config.contribution.js';
-import { AgentHostEnabledSettingId, AgentHostCustomTerminalToolEnabledSettingId, AgentHostAhpJsonlLoggingSettingId } from '../../../../platform/agentHost/common/agentService.js';
+import { AgentHostSdkSandboxEnabledSettingId, AgentHostOpus48PromptEnabledSettingId, AgentHostCustomTerminalToolEnabledSettingId, AgentHostAhpJsonlLoggingSettingId, ClaudePreferAgentHostEditorSettingId, ClaudePreferAgentHostAgentsSettingId, AgentHostEnabledSettingId } from '../../../../platform/agentHost/common/agentService.js';
 import '../../../../platform/networkFilter/common/networkFilterService.js';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { AgentNetworkDomainSettingId } from '../../../../platform/networkFilter/common/settings.js';
-import { AgentSandboxSettingId, AgentSandboxEnabledValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/settings';
+import { COPILOT_STRICT_MARKETPLACES_KEY, managedSettingValue, COPILOT_EXTRA_MARKETPLACES_KEY, COPILOT_ENABLED_PLUGINS_KEY, COPILOT_DISABLE_BYPASS_PERMISSIONS_MODE_KEY, COPILOT_MODEL_KEY, managedModelValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/policy/common/copilotManagedSettings';
+import { AgentSandboxEnabledValue, AgentSandboxSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/settings';
 import { registerEditorFeature } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorFeatures';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
@@ -52,14 +54,16 @@ import '../common/participants/chatSlashCommands.js';
 import '../common/tools/chatArtifactsService.js';
 import '../common/tools/chatTodoListService.js';
 import '../common/model/chatTransferService.js';
+import { LocalAgentDisabledInputTipContribution } from './agentSessions/localAgentDisabledInputTipContribution.js';
 import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService';
-import { ChatConfiguration, ChatPermissionLevel, ChatNotificationMode, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatConfiguration, BYOKUtilityModelDefault, ChatPermissionLevel, ChatNotificationMode, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelStats';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService';
 import './chatGoalSummaryService.js';
-import { agentPluginDiscoveryRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { agentPluginDiscoveryRegistry, AgentPluginDiscoveryPriority } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService';
 import { ChatPromptFilesExtensionPointHandler } from '../common/promptSyntax/chatPromptFilesContribution.js';
 import { PromptsConfig, isTildePath } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
 import { DEFAULT_HOOK_FILE_PATHS, DEFAULT_SKILL_SOURCE_FOLDERS, SKILL_FILENAME, AGENTS_SOURCE_FOLDER, COPILOT_USER_AGENTS_SOURCE_FOLDER, CLAUDE_AGENTS_SOURCE_FOLDER, AGENT_FILE_EXTENSION, LEGACY_MODE_DEFAULT_SOURCE_FOLDER, LEGACY_MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, DEFAULT_INSTRUCTIONS_SOURCE_FOLDERS, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
@@ -70,11 +74,17 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl';
 import { LanguageModelToolsExtensionPointHandler } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution';
+import { ClientToolSetsContribution } from './tools/clientToolSetsContribution.js';
 import './telemetry/chatModelCountTelemetry.js';
 import { BuiltinToolsContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/builtinTools/tools';
 import { RenameToolContribution } from './tools/renameTool.js';
 import { UsagesToolContribution } from './tools/usagesTool.js';
 import '../common/voiceChatService.js';
+import './voiceClient/voiceClientService.js';
+import './voiceClient/micCaptureService.js';
+import './voiceClient/ttsPlaybackService.js';
+import './voiceClient/voiceToolDispatchService.js';
+import './voiceClient/voiceSessionController.js';
 import { registerChatAccessibilityActions } from './actions/chatAccessibilityActions.js';
 import { PanelChatAccessibilityHelp, QuickChatAccessibilityHelp, EditsChatAccessibilityHelp, AgentChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
 import { ModeOpenChatGlobalAction, registerChatActions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -103,6 +113,7 @@ import { registerChatOpenAgentDebugPanelAction } from './actions/chatOpenAgentDe
 import '../common/chatDebugServiceImpl.js';
 import { ChatDebugEditor } from './chatDebug/chatDebugEditor.js';
 import { PromptsDebugContribution } from './promptsDebugContribution.js';
+import { AgentHostChatDebugContribution } from './chatDebug/agentHostChatDebugProvider.js';
 import { ChatDebugEditorInput, ChatDebugEditorInputSerializer } from './chatDebug/chatDebugEditorInput.js';
 import './agentSessions/agentSessions.contribution.js';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
@@ -142,13 +153,13 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookCompatibility';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
 import './aiCustomization/aiCustomizationIcons.js';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement';
+import './aiCustomization/promptsServiceCustomizationItemProvider.js';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import './chatOutputItemRenderer.js';
 import { ChatExtensionPointHandler, ChatCompatibilityNotifier } from './chatParticipant.contribution.js';
@@ -183,6 +194,7 @@ import './pluginInstallService.js';
 import { PluginAutoUpdate } from './pluginAutoUpdate.js';
 import './promptSyntax/promptCodingAgentActionContribution.js';
 import './promptSyntax/promptToolsCodeLensProvider.js';
+import './promptSyntax/promptToolSetsCodeLensProvider.js';
 import { ChatSlashCommandsContribution, ChatSessionOptionSlashCommandsContribution } from './chatSlashCommands.js';
 import './planReviewFeedback/planReviewFeedbackEditorContribution.js';
 import { registerPlanReviewFeedbackEditorActions } from './planReviewFeedback/planReviewFeedbackEditorActions.js';
@@ -201,9 +213,7 @@ import { ExploreAgentDefaultModel } from './exploreAgentDefaultModel.js';
 import { PlanAgentDefaultModel } from './planAgentDefaultModel.js';
 import { UtilitySmallModelContribution, UtilityModelContribution } from './utilityModelContribution.js';
 import './chatImageCarouselService.js';
-import { browserChatToolReferenceNames } from '../../browserView/common/browserChatToolReferenceNames.js';
 import '../../notebook/browser/controller/chat/notebook.chat.contribution.js';
-import { extraKnownMarketplacesToConfigDict } from '../common/plugins/marketplaceReference.js';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -217,13 +227,13 @@ jsonContributionRegistry.registerSchema(HOOK_SCHEMA_URI, hookFileSchema);
 const configurationRegistry = ( Registry.as(Extensions$1.Configuration));
 configurationRegistry.registerConfiguration({
     id: "chatSidebar",
-    title: ( localize(5880, "Chat")),
+    title: ( localize(6246, "Chat")),
     type: "object",
     properties: {
         "chat.experimentalSessionsWindowOverride": {
             type: "boolean",
             description: ( localize(
-                5881,
+                6247,
                 "When true, enables sessions-window-specific behavior for extensions."
             )),
             default: false,
@@ -234,41 +244,41 @@ configurationRegistry.registerConfiguration({
         },
         "chat.fontSize": {
             type: "number",
-            description: ( localize(5882, "Controls the font size in pixels in chat messages.")),
+            description: ( localize(6248, "Controls the font size in pixels in chat messages.")),
             default: 13,
             minimum: 6,
             maximum: 100
         },
         "chat.fontFamily": {
             type: "string",
-            description: ( localize(5883, "Controls the font family in chat messages.")),
+            description: ( localize(6249, "Controls the font family in chat messages.")),
             default: "default"
         },
         "chat.editor.fontSize": {
             type: "number",
-            description: ( localize(5884, "Controls the font size in pixels in chat codeblocks.")),
+            description: ( localize(6250, "Controls the font size in pixels in chat codeblocks.")),
             default: isMacintosh ? 12 : 14
         },
         "chat.editor.fontFamily": {
             type: "string",
-            description: ( localize(5885, "Controls the font family in chat codeblocks.")),
+            description: ( localize(6251, "Controls the font family in chat codeblocks.")),
             default: "default"
         },
         "chat.editor.fontWeight": {
             type: "string",
-            description: ( localize(5886, "Controls the font weight in chat codeblocks.")),
+            description: ( localize(6252, "Controls the font weight in chat codeblocks.")),
             default: "default"
         },
         "chat.editor.wordWrap": {
             type: "string",
-            description: ( localize(5887, "Controls whether lines should wrap in chat codeblocks.")),
+            description: ( localize(6253, "Controls whether lines should wrap in chat codeblocks.")),
             default: "off",
             enum: ["on", "off"]
         },
         "chat.editor.lineHeight": {
             type: "number",
             description: ( localize(
-                5888,
+                6254,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
@@ -276,12 +286,12 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.AgentStatusEnabled]: {
             type: "string",
             enum: ["hidden", "badge", "compact"],
-            enumDescriptions: [( localize(5889, "The agent status indicator is hidden from the title bar.")), ( localize(5890, "Shows the agent status as a badge next to the command center.")), ( localize(
-                5891,
+            enumDescriptions: [( localize(6255, "The agent status indicator is hidden from the title bar.")), ( localize(6256, "Shows the agent status as a badge next to the command center.")), ( localize(
+                6257,
                 "Replaces the command center search box with a compact agent status indicator and unified chat widget."
             ))],
             markdownDescription: ( localize(
-                5892,
+                6258,
                 "Controls how the 'Agent Status' indicator appears in the title bar command center. When set to `hidden`, the indicator is not shown. Other values show the indicator and automatically enable {0}. The unread and in-progress session indicators require {1} to be enabled.",
                 "`#window.commandCenter#`",
                 "`#chat.viewSessions.enabled#`"
@@ -292,7 +302,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.UnifiedAgentsBar]: {
             type: "boolean",
             markdownDescription: ( localize(
-                5893,
+                6259,
                 "Replaces the command center search box with a unified chat and search widget."
             )),
             default: false,
@@ -301,7 +311,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.AgentSessionProjectionEnabled]: {
             type: "boolean",
             markdownDescription: ( localize(
-                5894,
+                6260,
                 "Controls whether Agent Session Projection mode is enabled for reviewing agent sessions in a focused workspace."
             )),
             default: false,
@@ -310,14 +320,14 @@ configurationRegistry.registerConfiguration({
         "chat.implicitContext.enabled": {
             type: "object",
             description: ( localize(
-                5895,
+                6261,
                 "Enables automatically using the active editor as chat context for specified chat locations."
             )),
             additionalProperties: {
                 type: "string",
                 enum: ["never", "first", "always"],
-                description: ( localize(5896, "The value for the implicit context.")),
-                enumDescriptions: [( localize(5897, "Implicit context is never enabled.")), ( localize(5898, "Implicit context is enabled for the first interaction.")), ( localize(5899, "Implicit context is always enabled."))]
+                description: ( localize(6262, "The value for the implicit context.")),
+                enumDescriptions: [( localize(6263, "Implicit context is never enabled.")), ( localize(6264, "Implicit context is enabled for the first interaction.")), ( localize(6265, "Implicit context is always enabled."))]
             },
             default: {
                 "panel": "always"
@@ -335,7 +345,7 @@ configurationRegistry.registerConfiguration({
         "chat.implicitContext.suggestedContext": {
             type: "boolean",
             markdownDescription: ( localize(
-                5900,
+                6266,
                 "Controls whether the new implicit context flow is shown. In Ask and Edit modes, the context will automatically be included. When using an agent, context will be suggested as an attachment. Selections are always included as context."
             )),
             default: true,
@@ -343,10 +353,22 @@ configurationRegistry.registerConfiguration({
                 default: false
             }
         },
+        "chat.implicitContext.includeActiveEditor": {
+            type: "boolean",
+            markdownDescription: ( localize(
+                6267,
+                "When enabled, the active editor is automatically forwarded as context, even when it would otherwise only be suggested. Selections and explicitly attached files are always included regardless of this setting.\n\nNote: this setting currently only applies to Agent Host sessions (such as the Copilot CLI)."
+            )),
+            default: true,
+            tags: ["experimental"],
+            agentsWindow: {
+                default: false
+            }
+        },
         "chat.editing.autoAcceptDelay": {
             type: "number",
             markdownDescription: ( localize(
-                5901,
+                6268,
                 "Delay after which changes made by chat are automatically accepted. Values are in seconds, `0` means disabled and `100` seconds is the maximum."
             )),
             default: 0,
@@ -357,7 +379,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                5902,
+                6269,
                 "Whether to show a confirmation before removing a request and its associated edits."
             )),
             default: true
@@ -366,7 +388,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                5903,
+                6270,
                 "Whether to show a confirmation before retrying a request and its associated edits."
             )),
             default: true
@@ -374,7 +396,7 @@ configurationRegistry.registerConfiguration({
         "chat.editing.explainChanges.enabled": {
             type: "boolean",
             markdownDescription: ( localize(
-                5904,
+                6271,
                 "Controls whether the Explain button in the Chat panel and the Explain Changes context menu in the SCM view are shown. This is an experimental feature."
             )),
             default: false,
@@ -386,16 +408,24 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.RevealNextChangeOnResolve]: {
             type: "boolean",
             markdownDescription: ( localize(
-                5905,
+                6272,
                 "Controls whether the editor automatically reveals the next change after keeping or undoing a chat edit."
             )),
             default: true
         },
+        [ChatConfiguration.OpenChangedFileInDiffEditor]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                6273,
+                "Controls whether selecting a file in the changed files list of a chat response opens it in a diff editor showing the changes made by chat, or in a regular editor. Holding `kbstyle(Alt)` while selecting the file opens it with the opposite behavior."
+            )),
+            default: true
+        },
         "chat.tips.enabled": {
             type: "boolean",
             scope: ConfigurationScope.APPLICATION,
             description: ( localize(
-                5906,
+                6274,
                 "Controls whether tips are shown above user messages in chat. New tips are added frequently, so this is a helpful way to stay up to date with the latest features."
             )),
             default: true
@@ -403,9 +433,9 @@ configurationRegistry.registerConfiguration({
         "chat.upvoteAnimation": {
             type: "string",
             enum: ["off", "confetti", "floatingThumbs", "pulseWave", "radiantLines"],
-            enumDescriptions: [( localize(5907, "No animation is shown.")), ( localize(5908, "Shows a confetti burst animation around the thumbs up button.")), ( localize(5909, "Shows floating thumbs up icons rising from the button.")), ( localize(5910, "Shows expanding pulse rings from the button.")), ( localize(5911, "Shows radiant lines emanating from the button."))],
+            enumDescriptions: [( localize(6275, "No animation is shown.")), ( localize(6276, "Shows a confetti burst animation around the thumbs up button.")), ( localize(6277, "Shows floating thumbs up icons rising from the button.")), ( localize(6278, "Shows expanding pulse rings from the button.")), ( localize(6279, "Shows radiant lines emanating from the button."))],
             description: ( localize(
-                5912,
+                6280,
                 "Controls whether an animation is shown when clicking the thumbs up button on a chat response."
             )),
             default: "floatingThumbs"
@@ -413,16 +443,16 @@ configurationRegistry.registerConfiguration({
         "chat.experimental.detectParticipant.enabled": {
             type: "boolean",
             deprecationMessage: ( localize(
-                5913,
+                6281,
                 "This setting is deprecated. Please use `chat.detectParticipant.enabled` instead."
             )),
-            description: ( localize(5914, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(6282, "Enables chat participant autodetection for panel chat.")),
             default: null
         },
         [ChatConfiguration.IncrementalRendering]: {
             type: "boolean",
             description: ( localize(
-                5915,
+                6283,
                 "Enables incremental rendering with optional block-level animation when streaming chat responses."
             )),
             default: false,
@@ -431,17 +461,17 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.IncrementalRenderingStyle]: {
             type: "string",
             enum: ["none", "fade", "rise", "blur", "scale", "slide", "reveal"],
-            enumDescriptions: [( localize(5916, "No animation. Content appears instantly.")), ( localize(5917, "Simple opacity fade from 0 to 1.")), ( localize(5918, "Content fades in while rising upward.")), ( localize(5919, "Content fades in from a blurred state.")), ( localize(5920, "Content scales up from slightly smaller.")), ( localize(5921, "Content slides in from the left.")), ( localize(5922, "Content reveals top-to-bottom with a soft gradient edge."))],
-            description: ( localize(5923, "Controls the animation style for incremental rendering.")),
+            enumDescriptions: [( localize(6284, "No animation. Content appears instantly.")), ( localize(6285, "Simple opacity fade from 0 to 1.")), ( localize(6286, "Content fades in while rising upward.")), ( localize(6287, "Content fades in from a blurred state.")), ( localize(6288, "Content scales up from slightly smaller.")), ( localize(6289, "Content slides in from the left.")), ( localize(6290, "Content reveals top-to-bottom with a soft gradient edge."))],
+            description: ( localize(6291, "Controls the animation style for incremental rendering.")),
             default: "fade",
             tags: ["experimental"]
         },
         [ChatConfiguration.IncrementalRenderingBuffering]: {
             type: "string",
             enum: ["off", "word", "paragraph"],
-            enumDescriptions: [( localize(5924, "Renders content immediately as tokens arrive.")), ( localize(5925, "Reveals content word by word.")), ( localize(5926, "Buffers content until a paragraph break before rendering."))],
+            enumDescriptions: [( localize(6292, "Renders content immediately as tokens arrive.")), ( localize(6293, "Reveals content word by word.")), ( localize(6294, "Buffers content until a paragraph break before rendering."))],
             description: ( localize(
-                5927,
+                6295,
                 "Controls how content is buffered before rendering during incremental rendering. Lower buffering levels render faster but may show incomplete sentences or partially formed markdown."
             )),
             default: "word",
@@ -449,18 +479,18 @@ configurationRegistry.registerConfiguration({
         },
         "chat.detectParticipant.enabled": {
             type: "boolean",
-            description: ( localize(5928, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(6296, "Enables chat participant autodetection for panel chat.")),
             default: true
         },
         [ChatConfiguration.InlineReferencesStyle]: {
             type: "string",
             enum: ["box", "link"],
-            enumDescriptions: [( localize(5929, "Display file and symbol references as boxed widgets with icons.")), ( localize(
-                5930,
+            enumDescriptions: [( localize(6297, "Display file and symbol references as boxed widgets with icons.")), ( localize(
+                6298,
                 "Display file and symbol references as simple blue links without icons."
             ))],
             description: ( localize(
-                5931,
+                6299,
                 "Controls how file and symbol references are displayed in chat messages."
             )),
             default: "box"
@@ -468,7 +498,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.EditorAssociations]: {
             type: "object",
             markdownDescription: ( localize(
-                5932,
+                6300,
                 "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors for opening files from chat (for example `\"*.md\": \"vscode.markdown.preview.editor\"`)."
             )),
             additionalProperties: {
@@ -479,15 +509,15 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.NotifyWindowOnConfirmation]: {
             type: "string",
             enum: ["off", "windowNotFocused", "always"],
-            enumDescriptions: [( localize(5933, "Never show OS notifications for confirmations.")), ( localize(
-                5934,
+            enumDescriptions: [( localize(6301, "Never show OS notifications for confirmations.")), ( localize(
+                6302,
                 "Show OS notifications for confirmations when the window is not focused."
             )), ( localize(
-                5935,
+                6303,
                 "Always show OS notifications for confirmations, even when the window is focused."
             ))],
             description: ( localize(
-                5936,
+                6304,
                 "Controls whether a chat session should present the user with an OS notification when a confirmation or question needs input. This includes a window badge as well as notification toast."
             )),
             default: "windowNotFocused"
@@ -495,7 +525,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.AutoReply]: {
             default: false,
             markdownDescription: ( localize(
-                5937,
+                6305,
                 "Automatically skip question carousels by telling the agent that the user is not available and to use its best judgment. This is an advanced setting and can lead to unintended choices or actions based on incomplete context."
             )),
             type: "boolean",
@@ -505,7 +535,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.AutopilotAdvancedEnabled]: {
             type: "boolean",
             markdownDescription: ( localize(
-                5938,
+                6306,
                 "Enables **Advanced Autopilot**, a single switch that turns on all advanced Autopilot behaviors that delegate more of the loop to the agent. Currently, after each Autopilot turn a small, fast model evaluates whether your original request is complete; if not, Autopilot keeps working using that evaluation as guidance for the next turn, instead of relying on the agent to signal completion itself."
             )),
             default: false,
@@ -514,7 +544,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.PlanReviewInlineEditorEnabled]: {
             type: "boolean",
             markdownDescription: ( localize(
-                5939,
+                6307,
                 "When enabled, the plan review widget mounts an editor inline, as opposed to in a separate editor tab."
             )),
             default: true
@@ -526,14 +556,85 @@ configurationRegistry.registerConfiguration({
                 ChatPermissionLevel.AutoApprove,
                 ChatPermissionLevel.Autopilot
             ],
-            enumItemLabels: [( localize(5940, "Default Approvals")), ( localize(5941, "Bypass Approvals")), ( localize(5942, "Autopilot (Preview)"))],
-            enumDescriptions: [( localize(5943, "Start new chat sessions with Default Approvals.")), ( localize(5944, "Start new chat sessions in Bypass Approvals mode.")), ( localize(5945, "Start new chat sessions in Autopilot mode."))],
+            enumItemLabels: [( localize(6308, "Default Approvals")), ( localize(6309, "Bypass Approvals")), ( localize(6310, "Autopilot (Preview)"))],
+            enumDescriptions: [( localize(6311, "Start new chat sessions with Default Approvals.")), ( localize(6312, "Start new chat sessions in Bypass Approvals mode.")), ( localize(6313, "Start new chat sessions in Autopilot mode."))],
             description: ( localize(
-                5946,
-                "Controls the default permissions picker mode for new chat sessions. You can still change the permission mode per session, and each session remembers the permission mode that was used. If enterprise policy disables auto approval, new sessions use Default Approvals."
+                6314,
+                "Controls the default permissions picker mode for new local chat sessions. You can still change the permission mode per session, and each session remembers the permission mode that was used. If enterprise policy disables auto approval, new sessions use Default Approvals."
             )),
             default: ChatPermissionLevel.Default
         },
+        [ChatConfiguration.PermissionsSandboxToggleEnabled]: {
+            type: "boolean",
+            default: false,
+            markdownDescription: ( localize(
+                6315,
+                "Controls whether the permissions picker shows an inline \"Sandboxing for terminal\" toggle on the Default Approvals option. The toggle reflects and updates `#chat.agent.sandbox.enabled#`."
+            )),
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
+        },
+        [ChatConfiguration.DefaultConfiguration]: {
+            type: "object",
+            additionalProperties: false,
+            properties: {
+                mode: {
+                    type: "string",
+                    enum: ["interactive", "plan", "autopilot"],
+                    enumDescriptions: [( localize(6316, "Interactive — step-by-step collaboration.")), ( localize(6317, "Plan — plan first, execute when ready.")), ( localize(6318, "Autopilot — autonomously iterate from start to finish."))],
+                    default: "interactive",
+                    description: ( localize(6319, "The starting mode for new agent sessions."))
+                },
+                approvals: {
+                    type: "string",
+                    enum: [ChatPermissionLevel.Default, ChatPermissionLevel.AutoApprove],
+                    enumDescriptions: [( localize(6320, "Default Approvals — Copilot uses your configured settings.")), ( localize(6321, "Bypass Approvals — all tool calls are auto-approved."))],
+                    default: ChatPermissionLevel.Default,
+                    description: ( localize(
+                        6322,
+                        "The starting approval behavior for new agent sessions. If enterprise policy disables auto approval, new sessions use Default Approvals."
+                    ))
+                }
+            },
+            default: {
+                mode: "interactive",
+                approvals: ChatPermissionLevel.Default
+            },
+            markdownDescription: ( localize(
+                6323,
+                "Controls the default configuration for new agent sessions (such as Copilot CLI). You can still change the mode and approval behavior per session, and each session remembers what was used."
+            ))
+        },
+        [ChatConfiguration.DefaultModel]: {
+            type: "string",
+            default: "",
+            markdownDescription: ( localize(
+                6324,
+                "The default model for new chat conversations. Use \"auto\" to let Copilot pick a model, a model family name (such as \"opus\" or \"gemini\") to use the latest available model in that family, or a full model id. You can still switch the model within a conversation; each new conversation starts at this model."
+            )),
+            policy: {
+                name: "ChatDefaultModel",
+                category: PolicyCategory.InteractiveSession,
+                minimumVersion: "1.127",
+                value: managedModelValue(),
+                managedSettings: {
+                    [COPILOT_MODEL_KEY]: {
+                        type: "string"
+                    }
+                },
+                localization: {
+                    description: {
+                        key: "chat.defaultModel.policy",
+                        value: ( localize(
+                            6325,
+                            "Sets the default chat model for new conversations. Accepts \"auto\", a model family name (such as \"opus\" or \"gemini\"), or a full model id. Users can still switch the model within a conversation."
+                        ))
+                    }
+                }
+            }
+        },
         [ChatConfiguration.GlobalAutoApprove]: {
             default: false,
             markdownDescription: globalAutoApproveDescription.value,
@@ -544,12 +645,17 @@ configurationRegistry.registerConfiguration({
                 name: "ChatToolsAutoApprove",
                 category: PolicyCategory.InteractiveSession,
                 minimumVersion: "1.99",
-                value: policyData => policyData.chat_preview_features_enabled === false ? false : undefined,
+                value: policyData => policyData.managedSettings?.[COPILOT_DISABLE_BYPASS_PERMISSIONS_MODE_KEY] === "disable" || policyData.chat_preview_features_enabled === false ? false : undefined,
+                managedSettings: {
+                    [COPILOT_DISABLE_BYPASS_PERMISSIONS_MODE_KEY]: {
+                        type: "string"
+                    }
+                },
                 localization: {
                     description: {
                         key: "autoApprove3.description",
                         value: ( localize(
-                            5947,
+                            6326,
                             "Global auto approve also known as \"YOLO mode\" disables manual approval completely for all tools in all workspaces, allowing the agent to act fully autonomously. This is extremely dangerous and is *never* recommended, even containerized environments like Codespaces and Dev Containers have user keys forwarded into the container that could be compromised.\n\nThis feature disables critical security protections and makes it much easier for an attacker to compromise the machine.\n\nNote: This setting only controls tool approval and does not prevent the agent from asking questions. To automatically answer agent questions, use the `#chat.autoReply#` setting."
                         ))
                     }
@@ -559,7 +665,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.SessionSyncEnabled]: {
             default: false,
             markdownDescription: ( localize(
-                5948,
+                6327,
                 "Enable session sync to GitHub.com. When enabled, Copilot session data is synced to your GitHub account for cross-device access and richer insights. Requires `#github.copilot.chat.localIndex.enabled#` to also be enabled."
             )),
             type: "boolean",
@@ -576,7 +682,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.sessionSync.enabled.policy",
                         value: ( localize(
-                            5949,
+                            6328,
                             "Enable session sync to GitHub.com for cross-device Copilot session history. When disabled by organization policy, session data is kept local only."
                         ))
                     }
@@ -590,7 +696,7 @@ configurationRegistry.registerConfiguration({
             },
             default: [],
             markdownDescription: ( localize(
-                5950,
+                6329,
                 "Repository patterns to exclude from session sync. Use exact `owner/repo` names or glob patterns like `my-org/*`. Sessions from matching repositories will only be stored locally."
             )),
             tags: ["experimental", "advanced"]
@@ -608,7 +714,7 @@ configurationRegistry.registerConfiguration({
                 "**/*-lock.{yaml,json}": false
             },
             markdownDescription: ( localize(
-                5951,
+                6330,
                 "Controls whether edits made by the agent are automatically approved. The default is to approve all edits except those made to certain files which have the potential to cause immediate unintended side-effects, such as `**/.vscode/*.json`.\n\nSet to `true` to automatically approve edits to matching files, `false` to always require explicit approval. The last pattern matching a given file will determine whether the edit is automatically approved."
             )),
             type: "object",
@@ -622,7 +728,7 @@ configurationRegistry.registerConfiguration({
                 "https://github.com/microsoft/vscode/wiki/*": true
             },
             markdownDescription: ( localize(
-                5952,
+                6331,
                 "Controls which URLs are automatically approved when requested by chat tools. Keys are URL patterns and values can be `true` to approve both requests and responses, `false` to deny, or an object with `approveRequest` and `approveResponse` properties for granular control.\n\nExamples:\n- `\"https://example.com\": true` - Approve all requests to example.com\n- `\"https://*.example.com\": true` - Approve all requests to any subdomain of example.com\n- `\"https://example.com/api/*\": { \"approveRequest\": true, \"approveResponse\": false }` - Approve requests but not responses for example.com/api paths"
             )),
             type: "object",
@@ -645,7 +751,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.EligibleForAutoApproval]: {
             default: {},
             markdownDescription: ( localize(
-                5953,
+                6332,
                 "Controls which tools are eligible for automatic approval. Tools set to 'false' will always present a confirmation and will never offer the option to auto-approve. The default behavior (or setting a tool to 'true') may result in the tool offering auto-approval options."
             )),
             type: "object",
@@ -668,25 +774,16 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.tools.eligibleForAutoApproval",
                         value: ( localize(
-                            5953,
+                            6332,
                             "Controls which tools are eligible for automatic approval. Tools set to 'false' will always present a confirmation and will never offer the option to auto-approve. The default behavior (or setting a tool to 'true') may result in the tool offering auto-approval options."
                         ))
                     }
                 }
             }
         },
-        "chat.sendElementsToChat.attachImages": {
-            default: true,
-            markdownDescription: ( localize(
-                5954,
-                "Controls whether a screenshot of the selected element will be added to the chat."
-            )),
-            type: "boolean",
-            tags: ["experimental"]
-        },
         [ChatConfiguration.ArtifactsEnabled]: {
             default: false,
-            description: ( localize(5955, "Controls whether the artifacts view is available in chat.")),
+            description: ( localize(6333, "Controls whether the artifacts view is available in chat.")),
             type: "boolean",
             tags: ["experimental"]
         },
@@ -698,7 +795,7 @@ configurationRegistry.registerConfiguration({
                 }
             },
             description: ( localize(
-                5956,
+                6334,
                 "Rules for extracting artifacts from tool results by MIME type. Maps MIME type patterns (e.g. 'image/*') to group configuration."
             )),
             type: "object",
@@ -707,11 +804,11 @@ configurationRegistry.registerConfiguration({
                 properties: {
                     groupName: {
                         type: "string",
-                        description: ( localize(5957, "Display name for the artifact group."))
+                        description: ( localize(6335, "Display name for the artifact group."))
                     },
                     onlyShowGroup: {
                         type: "boolean",
-                        description: ( localize(5958, "When true, show only the group header instead of individual items."))
+                        description: ( localize(6336, "When true, show only the group header instead of individual items."))
                     }
                 },
                 required: ["groupName"]
@@ -725,7 +822,7 @@ configurationRegistry.registerConfiguration({
                 }
             },
             description: ( localize(
-                5959,
+                6337,
                 "Rules for extracting artifacts from written files by file path pattern. Maps glob patterns to group configuration."
             )),
             type: "object",
@@ -734,11 +831,11 @@ configurationRegistry.registerConfiguration({
                 properties: {
                     groupName: {
                         type: "string",
-                        description: ( localize(5960, "Display name for the artifact group."))
+                        description: ( localize(6338, "Display name for the artifact group."))
                     },
                     onlyShowGroup: {
                         type: "boolean",
-                        description: ( localize(5961, "When true, show only the group header instead of individual items."))
+                        description: ( localize(6339, "When true, show only the group header instead of individual items."))
                     }
                 },
                 required: ["groupName"]
@@ -752,7 +849,7 @@ configurationRegistry.registerConfiguration({
                 }
             },
             description: ( localize(
-                5962,
+                6340,
                 "Rules for extracting artifacts from memory tool calls by memory file path pattern. Maps glob patterns to group configuration."
             )),
             type: "object",
@@ -761,11 +858,11 @@ configurationRegistry.registerConfiguration({
                 properties: {
                     groupName: {
                         type: "string",
-                        description: ( localize(5963, "Display name for the artifact group."))
+                        description: ( localize(6341, "Display name for the artifact group."))
                     },
                     onlyShowGroup: {
                         type: "boolean",
-                        description: ( localize(5964, "When true, show only the group header instead of individual items."))
+                        description: ( localize(6342, "When true, show only the group header instead of individual items."))
                     }
                 },
                 required: ["groupName"]
@@ -775,14 +872,14 @@ configurationRegistry.registerConfiguration({
         "chat.undoRequests.restoreInput": {
             default: true,
             markdownDescription: ( localize(
-                5965,
+                6343,
                 "Controls whether the input of the chat should be restored when an undo request is made. The input will be filled with the text of the request that was restored."
             )),
             type: "boolean"
         },
         "chat.editRequests": {
             markdownDescription: ( localize(
-                5966,
+                6344,
                 "Enables editing of requests in the chat. This allows you to change the request content and resubmit it to the model."
             )),
             type: "string",
@@ -793,7 +890,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             description: ( localize(
-                5967,
+                6345,
                 "Show chat agent sessions when chat is empty or to the side when chat view is wide enough."
             )),
             agentsWindow: {
@@ -804,15 +901,15 @@ configurationRegistry.registerConfiguration({
             type: "string",
             enum: ["stacked", "sideBySide"],
             enumDescriptions: [( localize(
-                5968,
+                6346,
                 "Display chat sessions vertically stacked above the chat input unless a chat session is visible."
             )), ( localize(
-                5969,
+                6347,
                 "Display chat sessions side by side if space is sufficient, otherwise fallback to stacked above the chat input unless a chat session is visible."
             ))],
             default: "sideBySide",
             description: ( localize(
-                5970,
+                6348,
                 "Controls the orientation of the chat agent sessions view when it is shown alongside the chat."
             ))
         },
@@ -820,39 +917,64 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: false,
             description: ( localize(
-                5971,
+                6349,
                 "Show a progress badge on the chat view when an agent session is in progress that is opened in that view."
             ))
         },
         [ChatConfiguration.AgentsHandoffTipMode]: {
             type: "string",
             enum: ["hidden", "default", "custom"],
-            enumDescriptions: [( localize(5972, "Never show the handoff tip.")), ( localize(5973, "Show the handoff tip with the default description.")), ( localize(5974, "Show the handoff tip with an alternate description."))],
+            enumDescriptions: [( localize(6350, "Never show the handoff tip.")), ( localize(6351, "Show the handoff tip with the default description.")), ( localize(6352, "Show the handoff tip with an alternate description."))],
             default: "hidden",
             tags: ["experimental"],
             experiment: {
                 mode: "startup"
             },
             description: ( localize(
-                5975,
+                6353,
                 "Controls the tip shown above the chat input offering to continue eligible agent sessions in the Agents Window."
             ))
         },
+        [ClaudePreferAgentHostAgentsSettingId]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                6354,
+                "When enabled, Claude sessions opened from the Agents Window run inside the agent host process instead of the GitHub Copilot Chat extension. Only one Claude implementation surfaces per window. Requires `#{0}#`.",
+                AgentHostEnabledSettingId
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "startup"
+            }
+        },
+        [ClaudePreferAgentHostEditorSettingId]: {
+            type: "boolean",
+            description: ( localize(
+                6355,
+                "When enabled, Claude sessions opened from the regular workbench (sidebar chat) run inside the agent host process instead of the GitHub Copilot Chat extension. Only one Claude implementation surfaces per window."
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "startup"
+            }
+        },
         [ChatConfiguration.ChatContextUsageEnabled]: {
             type: "boolean",
             default: true,
-            description: ( localize(5976, "Show the context window usage indicator in the chat input."))
+            description: ( localize(6356, "Show the context window usage indicator in the chat input."))
         },
         [ChatConfiguration.ChatPersistentProgressEnabled]: {
             type: "boolean",
             default: product.quality !== "stable",
-            description: ( localize(5977, "Always show progress in chat."))
+            description: ( localize(6357, "Always show progress in chat."))
         },
         [ChatConfiguration.ProgressBorder]: {
             type: "boolean",
             default: true,
             markdownDescription: ( localize(
-                5978,
+                6358,
                 "Show an animated gradient border around the chat input while the agent is working or thinking. When enabled and reduced motion is not enabled, this overrides {0} to be off. Has no effect when reduced motion is enabled.",
                 "`#chat.persistentProgress.enabled#`"
             ))
@@ -860,16 +982,16 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.NotifyWindowOnResponseReceived]: {
             type: "string",
             enum: ["off", "windowNotFocused", "always"],
-            enumDescriptions: [( localize(5979, "Never show OS notifications for responses.")), ( localize(
-                5980,
+            enumDescriptions: [( localize(6359, "Never show OS notifications for responses.")), ( localize(
+                6360,
                 "Show OS notifications for responses when the window is not focused."
             )), ( localize(
-                5981,
+                6361,
                 "Always show OS notifications for responses, even when the window is focused."
             ))],
             default: "windowNotFocused",
             description: ( localize(
-                5982,
+                6362,
                 "Controls whether a chat session should present the user with an OS notification when a response is received. This includes a window badge as well as notification toast."
             ))
         },
@@ -877,23 +999,53 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             description: ( localize(
-                5983,
+                6363,
                 "Enables checkpoints in chat. Checkpoints allow you to restore the chat to a previous state."
             ))
         },
         "chat.checkpoints.showFileChanges": {
             type: "boolean",
-            description: ( localize(5984, "Controls whether to show chat checkpoint file changes.")),
+            description: ( localize(6364, "Controls whether to show chat checkpoint file changes.")),
             default: false
         },
+        [ChatConfiguration.TurnStatusPills]: {
+            type: "object",
+            markdownDescription: ( localize(
+                6365,
+                "Controls which agent turn status pills are shown above the chat input while a turn is in progress and inside the completed response. Only applies to agent sessions."
+            )),
+            properties: {
+                changes: {
+                    type: "boolean",
+                    default: false,
+                    description: ( localize(
+                        6366,
+                        "Show a pill summarizing the files changed and the lines added and removed in the turn."
+                    ))
+                },
+                preview: {
+                    type: "boolean",
+                    default: false,
+                    description: ( localize(
+                        6367,
+                        "Show a pill to preview a Markdown or HTML file created or edited in the turn."
+                    ))
+                }
+            },
+            default: {
+                changes: false,
+                preview: false
+            },
+            additionalProperties: false
+        },
         [mcpAccessConfig]: {
             type: "string",
-            description: ( localize(5985, "Controls access to installed Model Context Protocol servers.")),
+            description: ( localize(6368, "Controls access to installed Model Context Protocol servers.")),
             enum: [McpAccessValue.None, McpAccessValue.Registry, McpAccessValue.All],
-            enumDescriptions: [( localize(5986, "No access to MCP servers.")), ( localize(
-                5987,
+            enumDescriptions: [( localize(6369, "No access to MCP servers.")), ( localize(
+                6370,
                 "Allows access to MCP servers installed from the registry that VS Code is connected to."
-            )), ( localize(5988, "Allow access to any installed MCP server."))],
+            )), ( localize(6371, "Allow access to any installed MCP server."))],
             default: McpAccessValue.All,
             policy: {
                 name: "ChatMCP",
@@ -911,20 +1063,20 @@ configurationRegistry.registerConfiguration({
                 localization: {
                     description: {
                         key: "chat.mcp.access",
-                        value: ( localize(5985, "Controls access to installed Model Context Protocol servers."))
+                        value: ( localize(6368, "Controls access to installed Model Context Protocol servers."))
                     },
                     enumDescriptions: [{
                         key: "chat.mcp.access.none",
-                        value: ( localize(5986, "No access to MCP servers."))
+                        value: ( localize(6369, "No access to MCP servers."))
                     }, {
                         key: "chat.mcp.access.registry",
                         value: ( localize(
-                            5987,
+                            6370,
                             "Allows access to MCP servers installed from the registry that VS Code is connected to."
                         ))
                     }, {
                         key: "chat.mcp.access.any",
-                        value: ( localize(5988, "Allow access to any installed MCP server."))
+                        value: ( localize(6371, "Allow access to any installed MCP server."))
                     }]
                 }
             }
@@ -932,7 +1084,7 @@ configurationRegistry.registerConfiguration({
         [mcpAutoStartConfig]: {
             type: "string",
             description: ( localize(
-                5989,
+                6372,
                 "Controls whether MCP servers should be automatically started when the chat messages are submitted."
             )),
             default: McpAutoStartValue.NewAndOutdated,
@@ -941,8 +1093,8 @@ configurationRegistry.registerConfiguration({
                 McpAutoStartValue.OnlyNew,
                 McpAutoStartValue.NewAndOutdated
             ],
-            enumDescriptions: [( localize(5990, "Never automatically start MCP servers.")), ( localize(5991, "Only automatically start new MCP servers that have never been run.")), ( localize(
-                5992,
+            enumDescriptions: [( localize(6373, "Never automatically start MCP servers.")), ( localize(6374, "Only automatically start new MCP servers that have never been run.")), ( localize(
+                6375,
                 "Automatically start new and outdated MCP servers that are not yet running."
             ))],
             tags: ["experimental"]
@@ -950,7 +1102,7 @@ configurationRegistry.registerConfiguration({
         [mcpAppsEnabledConfig]: {
             type: "boolean",
             description: ( localize(
-                5993,
+                6376,
                 "Controls whether MCP servers can provide custom UI for tool invocations."
             )),
             default: true,
@@ -968,27 +1120,27 @@ configurationRegistry.registerConfiguration({
                     type: "string",
                     format: "uri",
                     markdownDescription: ( localize(
-                        5994,
+                        6377,
                         "The OAuth/OIDC issuer URL of the SSO authorization server. Must be an `https://` URL."
                     ))
                 },
                 clientId: {
                     type: "string",
                     markdownDescription: ( localize(
-                        5995,
+                        6378,
                         "The OAuth client ID registered with the SSO issuer for this device."
                     ))
                 },
                 clientSecret: {
                     type: "string",
                     markdownDescription: ( localize(
-                        5996,
+                        6379,
                         "The OAuth client secret paired with `clientId`. Intended for local development only."
                     ))
                 }
             },
             markdownDescription: ( localize(
-                5997,
+                6380,
                 "(Preview) The OAuth/OIDC IdP configuration used for enterprise-managed Model Context Protocol (MCP) servers. Typically delivered via enterprise policy (Windows Group Policy / macOS managed preferences / Linux `/etc/vscode/policy.json`); developers may hand-edit `settings.json` for local testing. Properties: `issuer` (HTTPS URL), `clientId`, `clientSecret`."
             )),
             policy: {
@@ -999,8 +1151,8 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "mcp.enterpriseManagedAuth.idp.policy",
                         value: ( localize(
-                            5998,
-                            "The OAuth/OIDC IdP configuration used for enterprise-managed Model Context Protocol (MCP) server authentication. Delivered through enterprise policy (Windows Group Policy, macOS managed preferences, Linux `/etc/vscode/policy.json`)."
+                            6381,
+                            "The OAuth/OIDC IdP configuration used for enterprise-managed Model Context Protocol (MCP) server authentication."
                         ))
                     }
                 }
@@ -1009,19 +1161,19 @@ configurationRegistry.registerConfiguration({
         [mcpServerCollisionBehaviorSection]: {
             type: "string",
             description: ( localize(
-                5999,
+                6382,
                 "Controls behavior when multiple MCP servers are discovered with the same name. 'disable' disables lower-priority duplicates. 'suffix' appends numeric suffixes to disambiguate."
             )),
             enum: [McpCollisionBehavior.Disable, McpCollisionBehavior.Suffix],
-            enumDescriptions: [( localize(6000, "Disable lower-priority servers with duplicate names.")), ( localize(6001, "Append numeric suffixes to servers with duplicate names."))],
+            enumDescriptions: [( localize(6383, "Disable lower-priority servers with duplicate names.")), ( localize(6384, "Append numeric suffixes to servers with duplicate names."))],
             default: McpCollisionBehavior.Disable
         },
         [mcpServerSamplingSection]: {
             type: "object",
             description: ( localize(
-                6002,
+                6385,
                 "Configures which models are exposed to MCP servers for sampling (making model requests in the background). This setting can be edited in a graphical way under the `{0}` command.",
-                "MCP: " + ( localize(6003, "List Servers"))
+                "MCP: " + ( localize(6386, "List Servers"))
             )),
             scope: ConfigurationScope.RESOURCE,
             additionalProperties: {
@@ -1030,7 +1182,7 @@ configurationRegistry.registerConfiguration({
                     allowedDuringChat: {
                         type: "boolean",
                         description: ( localize(
-                            6004,
+                            6387,
                             "Whether this server is allowed to make sampling requests during its tool calls in a chat session."
                         )),
                         default: true
@@ -1038,7 +1190,7 @@ configurationRegistry.registerConfiguration({
                     allowedOutsideChat: {
                         type: "boolean",
                         description: ( localize(
-                            6005,
+                            6388,
                             "Whether this server is allowed to make sampling requests outside of a chat session."
                         )),
                         default: false
@@ -1047,7 +1199,7 @@ configurationRegistry.registerConfiguration({
                         type: "array",
                         items: {
                             type: "string",
-                            description: ( localize(6006, "A model the MCP server has access to."))
+                            description: ( localize(6389, "A model the MCP server has access to."))
                         }
                     }
                 }
@@ -1056,7 +1208,7 @@ configurationRegistry.registerConfiguration({
         [AssistedTypes[AddConfigurationType.NuGetPackage].enabledConfigKey]: {
             type: "boolean",
             description: ( localize(
-                6007,
+                6390,
                 "Enables NuGet packages for AI-assisted MCP server installation. Used to install MCP servers by name from the central registry for .NET packages (NuGet.org)."
             )),
             default: false,
@@ -1067,7 +1219,7 @@ configurationRegistry.registerConfiguration({
         },
         [ChatConfiguration.ExtensionToolsEnabled]: {
             type: "boolean",
-            description: ( localize(6008, "Enable using tools contributed by third-party extensions.")),
+            description: ( localize(6391, "Enable using tools contributed by third-party extensions.")),
             default: true,
             policy: {
                 name: "ChatAgentExtensionTools",
@@ -1076,16 +1228,15 @@ configurationRegistry.registerConfiguration({
                 localization: {
                     description: {
                         key: "chat.extensionToolsEnabled",
-                        value: ( localize(6008, "Enable using tools contributed by third-party extensions."))
+                        value: ( localize(6391, "Enable using tools contributed by third-party extensions."))
                     }
                 }
             }
         },
         [ChatConfiguration.PluginsEnabled]: {
             type: "boolean",
-            description: ( localize(6009, "Enable agent plugin integration in chat.")),
+            description: ( localize(6392, "Enable agent plugin integration in chat.")),
             default: true,
-            tags: ["preview"],
             policy: {
                 name: "ChatPluginsEnabled",
                 category: PolicyCategory.InteractiveSession,
@@ -1093,7 +1244,7 @@ configurationRegistry.registerConfiguration({
                 localization: {
                     description: {
                         key: "chat.plugins.enabled",
-                        value: ( localize(6009, "Enable agent plugin integration in chat."))
+                        value: ( localize(6392, "Enable agent plugin integration in chat."))
                     }
                 }
             }
@@ -1105,7 +1256,7 @@ configurationRegistry.registerConfiguration({
             },
             restricted: true,
             markdownDescription: ( localize(
-                6010,
+                6393,
                 "Plugin directories to discover. Each key is a path that points directly to a plugin folder, and the value enables (`true`) or disables (`false`) it. Paths can be absolute, relative to the workspace root, or start with `~/` for the user's home directory."
             )),
             scope: ConfigurationScope.MACHINE,
@@ -1117,23 +1268,28 @@ configurationRegistry.registerConfiguration({
                 type: "boolean"
             },
             markdownDescription: ( localize(
-                6011,
-                "Enterprise-managed plugin enablement. Keys are plugin IDs in `<plugin>@<marketplace>` form (resolved to Copilot CLI install paths); values enable (`true`) or disable (`false`) the plugin. Discovered alongside the path-keyed entries in {0}. When set by policy, also restricts which marketplace-discovered plugins are allowed to load (only IDs mapped to `true` here pass the gate).",
-                `\`#${ChatConfiguration.PluginLocations}#\``
+                6394,
+                "Controls which [agent plugins](https://aka.ms/vscode-agent-plugins) are enabled or disabled. Keys are plugin IDs in `<plugin>@<marketplace>` form (where marketplace is defined in {1}); values enable (`true`) or disable (`false`) the plugin. Discovered alongside the path-keyed entries in {0}. When set by policy, only plugins mapped to `true` here are allowed to load.",
+                `\`#${ChatConfiguration.PluginLocations}#\``,
+                `\`#${ChatConfiguration.PluginMarketplaces}#\``
             )),
             scope: ConfigurationScope.APPLICATION,
-            tags: ["experimental"],
             policy: {
                 name: "ChatEnabledPlugins",
                 category: PolicyCategory.InteractiveSession,
                 minimumVersion: "1.122",
-                value: policyData => policyData.enabledPlugins ? JSON.stringify(policyData.enabledPlugins) : undefined,
+                value: managedSettingValue(COPILOT_ENABLED_PLUGINS_KEY),
+                managedSettings: {
+                    [COPILOT_ENABLED_PLUGINS_KEY]: {
+                        type: "string"
+                    }
+                },
                 localization: {
                     description: {
                         key: "chat.plugins.enabledPlugins.policy",
                         value: ( localize(
-                            6012,
-                            "Plugin enablement. Keys are plugin IDs in `<plugin>@<marketplace>` form; values enable or disable the plugin."
+                            6395,
+                            "Plugin enablement. Keys are plugin IDs in `{plugin}@{marketplace}` form; values enable or disable the plugin."
                         ))
                     }
                 }
@@ -1145,7 +1301,7 @@ configurationRegistry.registerConfiguration({
                 type: "string"
             },
             markdownDescription: ( localize(
-                6013,
+                6396,
                 "Plugin marketplaces to query. Entries may be GitHub shorthand (`owner/repo` or `owner/repo#ref`), direct Git repository URIs (`https://...git`, `ssh://...git`, or `git@host:path.git`, each optionally suffixed with `#ref`), or local repository URIs (`file:///...`). Equivalent GitHub shorthand and URI entries are deduplicated."
             )),
             default: ["github/copilot-plugins", "github/awesome-copilot#marketplace"],
@@ -1160,9 +1316,8 @@ configurationRegistry.registerConfiguration({
             default: {},
             scope: ConfigurationScope.APPLICATION,
             included: false,
-            tags: ["experimental"],
             markdownDescription: ( localize(
-                6014,
+                6397,
                 "Enterprise-managed additional plugin marketplaces. Unioned with {0}.",
                 `\`#${ChatConfiguration.PluginMarketplaces}#\``
             )),
@@ -1170,28 +1325,76 @@ configurationRegistry.registerConfiguration({
                 name: "ChatExtraMarketplaces",
                 category: PolicyCategory.InteractiveSession,
                 minimumVersion: "1.122",
-                value: policyData => {
-                    const obj = extraKnownMarketplacesToConfigDict(policyData.extraKnownMarketplaces);
-                    return obj ? JSON.stringify(obj) : undefined;
+                value: managedSettingValue(COPILOT_EXTRA_MARKETPLACES_KEY),
+                managedSettings: {
+                    [COPILOT_EXTRA_MARKETPLACES_KEY]: {
+                        type: "string"
+                    }
                 },
                 localization: {
                     description: {
                         key: "chat.plugins.extraMarketplaces.policy",
                         value: ( localize(
-                            6015,
-                            "Additional plugin marketplaces to query. Keys are marketplace names; values are GitHub shorthand (`owner/repo[#ref]`) or Git URIs (`<url>[#ref]`)."
+                            6398,
+                            "Additional plugin marketplaces to query. Keys are marketplace names; values are GitHub shorthand (`owner/repo[#ref]`) or Git URIs (`{url}[#ref]`)."
                         ))
                     }
                 }
             }
         },
         [ChatConfiguration.StrictMarketplaces]: {
-            type: "boolean",
+            type: ["array", "null"],
+            items: {
+                type: "object",
+                properties: {
+                    source: {
+                        type: "string",
+                        enum: [
+                            "github",
+                            "git",
+                            "url",
+                            "npm",
+                            "file",
+                            "directory",
+                            "hostPattern",
+                            "pathPattern"
+                        ]
+                    },
+                    repo: {
+                        type: "string"
+                    },
+                    url: {
+                        type: "string"
+                    },
+                    ref: {
+                        type: "string"
+                    },
+                    path: {
+                        type: "string"
+                    },
+                    package: {
+                        type: "string"
+                    },
+                    hostPattern: {
+                        type: "string"
+                    },
+                    pathPattern: {
+                        type: "string"
+                    },
+                    headers: {
+                        type: "object",
+                        additionalProperties: {
+                            type: "string"
+                        }
+                    }
+                },
+                required: ["source"]
+            },
             markdownDescription: ( localize(
-                6016,
-                "When enabled, only marketplaces supplied via enterprise policy are trusted. Plugins from any other marketplace will not load."
+                6399,
+                "Enterprise-managed allowlist of plugin marketplace sources. When set, only marketplaces matching one of these entries can be installed; an empty array blocks all marketplaces. This does not retroactively disable already-installed plugins. Each entry is an object with a `source` discriminator (`github`, `git`, `url`, `npm`, `file`, `directory`, `hostPattern`, or `pathPattern`) and the corresponding fields. Typically delivered via enterprise policy."
             )),
-            default: false,
+            default: null,
             restricted: true,
             scope: ConfigurationScope.APPLICATION,
             tags: ["experimental"],
@@ -1199,13 +1402,18 @@ configurationRegistry.registerConfiguration({
                 name: "ChatStrictMarketplaces",
                 category: PolicyCategory.InteractiveSession,
                 minimumVersion: "1.122",
-                value: policyData => policyData.strictKnownMarketplaces,
+                value: managedSettingValue(COPILOT_STRICT_MARKETPLACES_KEY),
+                managedSettings: {
+                    [COPILOT_STRICT_MARKETPLACES_KEY]: {
+                        type: "string"
+                    }
+                },
                 localization: {
                     description: {
                         key: "chat.plugins.strictMarketplaces.policy",
                         value: ( localize(
-                            6017,
-                            "Only trust marketplaces supplied via enterprise policy; plugins from any other marketplace will not load."
+                            6400,
+                            "Allowlist of plugin marketplace sources. When set, only marketplaces matching an entry are trusted; an empty array blocks all marketplaces."
                         ))
                     }
                 }
@@ -1214,7 +1422,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.AgentEnabled]: {
             type: "boolean",
             description: ( localize(
-                6018,
+                6401,
                 "When enabled, agent mode can be activated from chat and tools in agentic contexts with side effects can be used."
             )),
             default: true,
@@ -1228,7 +1436,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.agent.enabled.description",
                         value: ( localize(
-                            6018,
+                            6401,
                             "When enabled, agent mode can be activated from chat and tools in agentic contexts with side effects can be used."
                         ))
                     }
@@ -1237,7 +1445,7 @@ configurationRegistry.registerConfiguration({
         },
         [AgentNetworkDomainSettingId.NetworkFilter]: {
             markdownDescription: ( localize(
-                6019,
+                6402,
                 "When enabled, network access by agent tools (fetch tool, integrated browser) is restricted according to {0} and {1}. Domain filtering is also applied to those tools when {2} is enabled.",
                 `\`#${AgentNetworkDomainSettingId.AllowedNetworkDomains}#\``,
                 `\`#${AgentNetworkDomainSettingId.DeniedNetworkDomains}#\``,
@@ -1254,7 +1462,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.agent.networkFilter",
                         value: ( localize(
-                            6019,
+                            6402,
                             "When enabled, network access by agent tools (fetch tool, integrated browser) is restricted according to {0} and {1}. Domain filtering is also applied to those tools when {2} is enabled.",
                             `\`#${AgentNetworkDomainSettingId.AllowedNetworkDomains}#\``,
                             `\`#${AgentNetworkDomainSettingId.DeniedNetworkDomains}#\``,
@@ -1266,11 +1474,11 @@ configurationRegistry.registerConfiguration({
         },
         [AgentNetworkDomainSettingId.AllowedNetworkDomains]: {
             markdownDescription: ( localize(
-                6020,
-                "Allowed domains for network access by agent tools (fetch tool, integrated browser). Applies when {0} or {1} is enabled. When {1} is set to {2}, all domains are allowed. Supports wildcards like {3}. When both allowed and denied lists are empty, all domains are blocked. Denied domains (see {4}) take precedence.",
+                6403,
+                "Allowed domains for network access by agent tools (fetch tool, integrated browser). Applies when {0} or {1} is enabled. When {2} is enabled, all domains are allowed. Supports wildcards like {3}. When both allowed and denied lists are empty, all domains are blocked. Denied domains (see {4}) take precedence.",
                 `\`#${AgentNetworkDomainSettingId.NetworkFilter}#\``,
                 `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``,
-                `\`${AgentSandboxEnabledValue.AllowNetwork}\``,
+                `\`#${AgentSandboxSettingId.AgentSandboxAllowNetwork}#\``,
                 "`*.example.com`",
                 `\`#${AgentNetworkDomainSettingId.DeniedNetworkDomains}#\``
             )),
@@ -1288,11 +1496,11 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.agent.allowedNetworkDomains",
                         value: ( localize(
-                            6020,
-                            "Allowed domains for network access by agent tools (fetch tool, integrated browser). Applies when {0} or {1} is enabled. When {1} is set to {2}, all domains are allowed. Supports wildcards like {3}. When both allowed and denied lists are empty, all domains are blocked. Denied domains (see {4}) take precedence.",
+                            6403,
+                            "Allowed domains for network access by agent tools (fetch tool, integrated browser). Applies when {0} or {1} is enabled. When {2} is enabled, all domains are allowed. Supports wildcards like {3}. When both allowed and denied lists are empty, all domains are blocked. Denied domains (see {4}) take precedence.",
                             `\`#${AgentNetworkDomainSettingId.NetworkFilter}#\``,
                             `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``,
-                            `\`${AgentSandboxEnabledValue.AllowNetwork}\``,
+                            `\`#${AgentSandboxSettingId.AgentSandboxAllowNetwork}#\``,
                             "`*.example.com`",
                             `\`#${AgentNetworkDomainSettingId.DeniedNetworkDomains}#\``
                         ))
@@ -1302,11 +1510,11 @@ configurationRegistry.registerConfiguration({
         },
         [AgentNetworkDomainSettingId.DeniedNetworkDomains]: {
             markdownDescription: ( localize(
-                6021,
-                "Denied domains for network access by agent tools (fetch tool, integrated browser). Applies when {0} or {1} is enabled. This does not apply when {1} is set to {2}. Takes precedence over {3}. Supports wildcards like {4}.",
+                6404,
+                "Denied domains for network access by agent tools (fetch tool, integrated browser). Applies when {0} or {1} is enabled. This does not apply when {2} is enabled. Takes precedence over {3}. Supports wildcards like {4}.",
                 `\`#${AgentNetworkDomainSettingId.NetworkFilter}#\``,
                 `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``,
-                `\`${AgentSandboxEnabledValue.AllowNetwork}\``,
+                `\`#${AgentSandboxSettingId.AgentSandboxAllowNetwork}#\``,
                 `\`#${AgentNetworkDomainSettingId.AllowedNetworkDomains}#\``,
                 "`*.example.com`"
             )),
@@ -1324,11 +1532,11 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.agent.deniedNetworkDomains",
                         value: ( localize(
-                            6021,
-                            "Denied domains for network access by agent tools (fetch tool, integrated browser). Applies when {0} or {1} is enabled. This does not apply when {1} is set to {2}. Takes precedence over {3}. Supports wildcards like {4}.",
+                            6404,
+                            "Denied domains for network access by agent tools (fetch tool, integrated browser). Applies when {0} or {1} is enabled. This does not apply when {2} is enabled. Takes precedence over {3}. Supports wildcards like {4}.",
                             `\`#${AgentNetworkDomainSettingId.NetworkFilter}#\``,
                             `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``,
-                            `\`${AgentSandboxEnabledValue.AllowNetwork}\``,
+                            `\`#${AgentSandboxSettingId.AgentSandboxAllowNetwork}#\``,
                             `\`#${AgentNetworkDomainSettingId.AllowedNetworkDomains}#\``,
                             "`*.example.com`"
                         ))
@@ -1343,7 +1551,7 @@ configurationRegistry.registerConfiguration({
             },
             deprecated: true,
             markdownDeprecationMessage: ( localize(
-                6022,
+                6405,
                 "Use {0} instead",
                 `\`#${AgentNetworkDomainSettingId.AllowedNetworkDomains}#\``
             ))
@@ -1355,7 +1563,7 @@ configurationRegistry.registerConfiguration({
             },
             deprecated: true,
             markdownDeprecationMessage: ( localize(
-                6023,
+                6406,
                 "Use {0} instead",
                 `\`#${AgentNetworkDomainSettingId.DeniedNetworkDomains}#\``
             ))
@@ -1367,7 +1575,7 @@ configurationRegistry.registerConfiguration({
             },
             deprecated: true,
             markdownDeprecationMessage: ( localize(
-                6024,
+                6407,
                 "Use {0} instead",
                 `\`#${AgentNetworkDomainSettingId.AllowedNetworkDomains}#\``
             ))
@@ -1379,7 +1587,7 @@ configurationRegistry.registerConfiguration({
             },
             deprecated: true,
             markdownDeprecationMessage: ( localize(
-                6025,
+                6408,
                 "Use {0} instead",
                 `\`#${AgentNetworkDomainSettingId.DeniedNetworkDomains}#\``
             ))
@@ -1387,7 +1595,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.DefaultNewSessionMode]: {
             type: "string",
             description: ( localize(
-                6026,
+                6409,
                 "The default mode for new chat sessions. When empty, the chat view's default mode is used."
             )),
             default: ""
@@ -1395,7 +1603,7 @@ configurationRegistry.registerConfiguration({
         [AgentHostAhpJsonlLoggingSettingId]: {
             type: "boolean",
             description: ( localize(
-                6027,
+                6410,
                 "When enabled, logs all AHP transport messages for agent host connections to JSONL files under the window's log directory."
             )),
             default: product.quality !== "stable",
@@ -1404,47 +1612,52 @@ configurationRegistry.registerConfiguration({
         [AgentHostCustomTerminalToolEnabledSettingId]: {
             type: "boolean",
             description: ( localize(
-                6028,
+                6411,
                 "When enabled, Copilot SDK sessions use the Agent Host terminal tool override instead of the SDK's default terminal behavior."
             )),
             default: false,
             tags: ["experimental", "advanced"]
         },
-        [ChatConfiguration.AgentHostDefaultChatProvider]: {
+        [AgentHostOpus48PromptEnabledSettingId]: {
             type: "boolean",
+            description: ( localize(
+                6412,
+                "When enabled, Copilot SDK sessions running a Claude Opus 4.8 model apply Opus 4.8-tuned system-prompt section overrides on top of the default system message."
+            )),
             default: false,
-            tags: ["experimental"],
-            experiment: {
-                mode: "startup"
-            },
-            markdownDescription: ( localize(
-                6029,
-                "When enabled, the local agent host is used as the default provider in the VS Code chat session-target picker. Requires `#{0}#`.",
-                AgentHostEnabledSettingId
-            ))
+            tags: ["experimental", "advanced"]
         },
-        [ChatConfiguration.AgentHostClientTools]: {
-            type: "array",
-            items: {
-                type: "string"
-            },
-            description: ( localize(
-                6030,
-                "Tool reference names to expose as client-provided tools in agent host sessions."
-            )),
-            default: [
-                "runTask",
-                "getTaskOutput",
-                "problems",
-                "runTests",
-                ...browserChatToolReferenceNames
+        [AgentHostSdkSandboxEnabledSettingId]: {
+            type: "string",
+            enum: [
+                AgentSandboxEnabledValue.Off,
+                AgentSandboxEnabledValue.On,
+                AgentSandboxEnabledValue.AllowNetwork
             ],
-            tags: ["experimental", "advanced"]
+            enumDescriptions: [( localize(
+                6413,
+                "No sandbox policy is forwarded for the SDK's built-in shell tool — commands run unsandboxed."
+            )), ( localize(
+                6414,
+                "The SDK's built-in shell tool runs inside a sandbox using the configured filesystem policy and host-list-restricted network."
+            )), ( localize(
+                6415,
+                "The SDK's built-in shell tool runs inside a sandbox with unrestricted outbound network access."
+            ))],
+            markdownDescription: ( localize(
+                6416,
+                "Sandbox mode for the Copilot SDK's built-in shell tool. Only takes effect when `#chat.agentHost.customTerminalTool.enabled#` is `false`; when the Agent Host's own terminal tool is enabled, the engine sandbox is controlled by `#chat.agent.sandbox.enabled#`. The sandbox applies only to requests that run with default approvals — not when approvals are bypassed — and is not supported on Windows yet."
+            )),
+            default: AgentSandboxEnabledValue.Off,
+            tags: ["experimental", "advanced"],
+            experiment: {
+                mode: "auto"
+            }
         },
         [ChatConfiguration.ToolConfirmationCarousel]: {
             type: "boolean",
             description: ( localize(
-                6031,
+                6417,
                 "When enabled, multiple tool confirmations are batched into a carousel above the input."
             )),
             default: true
@@ -1452,8 +1665,8 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.ToolRiskAssessmentEnabled]: {
             type: "boolean",
             description: ( localize(
-                6032,
-                "When enabled, terminal tool confirmations show an LLM-generated risk level (Safe / Caution / Review carefully) and a short explanation."
+                6418,
+                "When enabled, tool confirmations show an LLM-generated risk level (Safe / Caution / Review carefully) and a short explanation."
             )),
             default: true,
             experiment: {
@@ -1463,7 +1676,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.ToolRiskAssessmentModel]: {
             type: "string",
             description: ( localize(
-                6033,
+                6419,
                 "The language model id used to generate tool risk assessments. Should be a small, fast model."
             )),
             default: "copilot-utility-small",
@@ -1475,7 +1688,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.PlanAgentDefaultModel]: {
             type: "string",
             description: ( localize(
-                6034,
+                6420,
                 "Select the default language model to use for the Plan agent from the available providers."
             )),
             default: "",
@@ -1486,7 +1699,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.ExploreAgentDefaultModel]: {
             type: "string",
             description: ( localize(
-                6035,
+                6421,
                 "Select the default language model to use for the Explore subagent from the available providers."
             )),
             default: "",
@@ -1494,11 +1707,28 @@ configurationRegistry.registerConfiguration({
             enumItemLabels: ExploreAgentDefaultModel.modelLabels,
             markdownEnumDescriptions: ExploreAgentDefaultModel.modelDescriptions
         },
+        [ChatConfiguration.BYOKUtilityModelDefault]: {
+            type: "string",
+            markdownDescription: ( localize(
+                6422,
+                "Controls the default model used by built-in utility flows when the selected main agent model is a bring your own key (BYOK) model. This setting has no effect when the selected main agent model is provided by GitHub Copilot. A specific model configured in {0} or {1} takes precedence.",
+                "`#chat.utilityModel#`",
+                "`#chat.utilitySmallModel#`"
+            )),
+            enum: [
+                BYOKUtilityModelDefault.None,
+                BYOKUtilityModelDefault.MainAgent,
+                BYOKUtilityModelDefault.Copilot
+            ],
+            enumItemLabels: [( localize(6423, "None")), ( localize(6424, "Main Agent Model")), ( localize(6425, "GitHub Copilot"))],
+            markdownEnumDescriptions: [( localize(6426, "Do not use a default utility model.")), ( localize(6427, "Use the selected BYOK main agent model.")), ( localize(6428, "Use the default GitHub Copilot utility models."))],
+            default: BYOKUtilityModelDefault.None
+        },
         [ChatConfiguration.UtilityModel]: {
             type: "string",
             description: ( localize(
-                6036,
-                "Override the language model used by built-in utility flows. Leave empty to use the default model."
+                6429,
+                "Override the language model used by built-in utility flows. Leave empty to use the configured default behavior."
             )),
             default: "",
             enum: UtilityModelContribution.modelIds,
@@ -1508,8 +1738,8 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.UtilitySmallModel]: {
             type: "string",
             description: ( localize(
-                6037,
-                "Override the language model used by built-in small/fast utility flows. A fast and inexpensive model is recommended. Leave empty to use the default model."
+                6430,
+                "Override the language model used by built-in small/fast utility flows. A fast and inexpensive model is recommended. Leave empty to use the configured default behavior."
             )),
             default: "",
             enum: UtilitySmallModelContribution.modelIds,
@@ -1519,45 +1749,25 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.RequestQueueingDefaultAction]: {
             type: "string",
             enum: ["queue", "steer"],
-            enumDescriptions: [( localize(6038, "Queue the message to send after the current request completes.")), ( localize(
-                6039,
+            enumDescriptions: [( localize(6431, "Queue the message to send after the current request completes.")), ( localize(
+                6432,
                 "Steer the current request by sending the message immediately, signaling the current request to yield."
             ))],
             description: ( localize(
-                6040,
+                6433,
                 "Controls which action is the default for the queue button when a request is in progress."
             )),
             default: "steer"
         },
-        [ChatConfiguration.EditModeHidden]: {
-            type: "boolean",
-            description: ( localize(6041, "When enabled, hides the Edit mode from the chat mode picker.")),
-            default: true,
-            tags: ["experimental"],
-            experiment: {
-                mode: "auto"
-            },
-            policy: {
-                name: "DeprecatedEditModeHidden",
-                category: PolicyCategory.InteractiveSession,
-                minimumVersion: "1.112",
-                localization: {
-                    description: {
-                        key: "chat.editMode.hidden",
-                        value: ( localize(6041, "When enabled, hides the Edit mode from the chat mode picker."))
-                    }
-                }
-            }
-        },
         [ChatConfiguration.EnableMath]: {
             type: "boolean",
-            description: ( localize(6042, "Enable math rendering in chat responses using KaTeX.")),
+            description: ( localize(6434, "Enable math rendering in chat responses using KaTeX.")),
             default: true
         },
         [ChatConfiguration.ShowCodeBlockProgressAnimation]: {
             type: "boolean",
             description: ( localize(
-                6043,
+                6435,
                 "When applying edits, show a progress animation in the code block pill. If disabled, shows the progress percentage instead."
             )),
             default: true,
@@ -1572,7 +1782,7 @@ configurationRegistry.registerConfiguration({
             additionalProperties: false,
             default: Object.fromEntries(( allDiscoverySources.map(k => [k, false]))),
             markdownDescription: ( localize(
-                6044,
+                6436,
                 "Configures discovery of Model Context Protocol servers from configuration from various other applications."
             ))
         },
@@ -1581,14 +1791,14 @@ configurationRegistry.registerConfiguration({
             default: false,
             tags: ["preview"],
             description: ( localize(
-                6045,
+                6437,
                 "Enables the default Marketplace for Model Context Protocol (MCP) servers."
             )),
             included: product.quality === "stable"
         },
         [mcpGalleryServiceUrlConfig]: {
             type: "string",
-            description: ( localize(6046, "Configure the MCP Gallery service URL to connect to")),
+            description: ( localize(6438, "Configure the MCP Gallery service URL to connect to")),
             default: "",
             scope: ConfigurationScope.APPLICATION,
             tags: ["usesOnlineServices", "advanced"],
@@ -1601,16 +1811,16 @@ configurationRegistry.registerConfiguration({
                 localization: {
                     description: {
                         key: "mcp.gallery.serviceUrl",
-                        value: ( localize(6046, "Configure the MCP Gallery service URL to connect to"))
+                        value: ( localize(6438, "Configure the MCP Gallery service URL to connect to"))
                     }
                 }
             }
         },
         [PromptsConfig.INSTRUCTIONS_LOCATION_KEY]: {
             type: "object",
-            title: ( localize(6047, "Instructions File Locations")),
+            title: ( localize(6439, "Instructions File Locations")),
             markdownDescription: ( localize(
-                6048,
+                6440,
                 "Specify location(s) of instructions files (`*{0}`) that can be attached in Chat sessions. [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
                 INSTRUCTION_FILE_EXTENSION,
                 INSTRUCTIONS_DOCUMENTATION_URL
@@ -1629,7 +1839,7 @@ configurationRegistry.registerConfiguration({
             propertyNames: {
                 pattern: VALID_PROMPT_FOLDER_PATTERN,
                 patternErrorMessage: ( localize(
-                    6049,
+                    6441,
                     "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported. Glob patterns are deprecated and will be removed in future versions."
                 ))
             },
@@ -1644,9 +1854,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.PROMPT_LOCATIONS_KEY]: {
             type: "object",
-            title: ( localize(6050, "Prompt File Locations")),
+            title: ( localize(6442, "Prompt File Locations")),
             markdownDescription: ( localize(
-                6051,
+                6443,
                 "Specify location(s) of reusable prompt files (`*{0}`) that can be run in Chat sessions. [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
                 PROMPT_FILE_EXTENSION,
                 PROMPT_DOCUMENTATION_URL
@@ -1663,7 +1873,7 @@ configurationRegistry.registerConfiguration({
             propertyNames: {
                 pattern: VALID_PROMPT_FOLDER_PATTERN,
                 patternErrorMessage: ( localize(
-                    6052,
+                    6444,
                     "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported. Glob patterns are deprecated and will be removed in future versions."
                 ))
             },
@@ -1678,9 +1888,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.MODE_LOCATION_KEY]: {
             type: "object",
-            title: ( localize(6053, "Mode File Locations")),
+            title: ( localize(6445, "Mode File Locations")),
             markdownDescription: ( localize(
-                6054,
+                6446,
                 "Specify location(s) of custom chat mode files (`*{0}`). [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
                 LEGACY_MODE_FILE_EXTENSION,
                 AGENT_DOCUMENTATION_URL
@@ -1689,7 +1899,7 @@ configurationRegistry.registerConfiguration({
                 [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true
             },
             deprecationMessage: ( localize(
-                6055,
+                6447,
                 "This setting is deprecated and will be removed in future releases. Chat modes are now called custom agents and are located in `.github/agents`"
             )),
             additionalProperties: {
@@ -1715,9 +1925,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.AGENTS_LOCATION_KEY]: {
             type: "object",
-            title: ( localize(6056, "Agent File Locations")),
+            title: ( localize(6448, "Agent File Locations")),
             markdownDescription: ( localize(
-                6057,
+                6449,
                 "Specify location(s) of custom agent files (`*{0}`). [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
                 AGENT_FILE_EXTENSION,
                 AGENT_DOCUMENTATION_URL
@@ -1733,7 +1943,7 @@ configurationRegistry.registerConfiguration({
             propertyNames: {
                 pattern: VALID_PROMPT_FOLDER_PATTERN,
                 patternErrorMessage: ( localize(
-                    6058,
+                    6450,
                     "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported."
                 ))
             },
@@ -1750,9 +1960,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_AGENT_MD]: {
             type: "boolean",
-            title: ( localize(6059, "Use AGENTS.md file")),
+            title: ( localize(6451, "Use AGENTS.md file")),
             markdownDescription: ( localize(
-                6060,
+                6452,
                 "Controls whether instructions from `AGENTS.md` file found in a workspace roots are attached to all chat requests."
             )),
             default: true,
@@ -1762,9 +1972,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_NESTED_AGENT_MD]: {
             type: "boolean",
-            title: ( localize(6061, "Use nested AGENTS.md files")),
+            title: ( localize(6453, "Use nested AGENTS.md files")),
             markdownDescription: ( localize(
-                6062,
+                6454,
                 "Controls whether instructions from nested `AGENTS.md` files found in the workspace are listed in all chat requests. The language model can load these skills on-demand if the `read` tool is available."
             )),
             default: false,
@@ -1780,9 +1990,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_CLAUDE_MD]: {
             type: "boolean",
-            title: ( localize(6063, "Use CLAUDE.md file")),
+            title: ( localize(6455, "Use CLAUDE.md file")),
             markdownDescription: ( localize(
-                6064,
+                6456,
                 "Controls whether instructions from `CLAUDE.md` file found in workspace roots, .claude and ~/.claude folder are attached to all chat requests."
             )),
             default: true,
@@ -1792,9 +2002,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_AGENT_SKILLS]: {
             type: "boolean",
-            title: ( localize(6065, "Use Agent skills")),
+            title: ( localize(6457, "Use Agent skills")),
             markdownDescription: ( localize(
-                6066,
+                6458,
                 "Controls whether skills are provided as specialized capabilities to the chat requests. Skills are loaded from the folders configured in `#chat.agentSkillsLocations#`. The language model can load these skills on-demand if the `read` tool is available. Learn more about [Agent Skills](https://aka.ms/vscode-agent-skills)."
             )),
             default: true,
@@ -1804,9 +2014,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_SKILL_ADHERENCE_PROMPT]: {
             type: "boolean",
-            title: ( localize(6067, "Use Skill Adherence Prompt")),
+            title: ( localize(6459, "Use Skill Adherence Prompt")),
             markdownDescription: ( localize(
-                6068,
+                6460,
                 "Controls whether a stronger skill adherence prompt is used that encourages the model to immediately invoke skills when relevant rather than just announcing them."
             )),
             default: false,
@@ -1825,9 +2035,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS]: {
             type: "boolean",
-            title: ( localize(6069, "Include Applying Instructions")),
+            title: ( localize(6461, "Include Applying Instructions")),
             markdownDescription: ( localize(
-                6070,
+                6462,
                 "Controls whether instructions with a matching 'applyTo' attribute are automatically included in chat requests."
             )),
             default: true,
@@ -1837,9 +2047,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.INCLUDE_REFERENCED_INSTRUCTIONS]: {
             type: "boolean",
-            title: ( localize(6071, "Include Referenced Instructions")),
+            title: ( localize(6463, "Include Referenced Instructions")),
             markdownDescription: ( localize(
-                6072,
+                6464,
                 "Controls whether referenced instructions are automatically included in chat requests."
             )),
             default: false,
@@ -1849,9 +2059,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS]: {
             type: "boolean",
-            title: ( localize(6073, "Use Customizations in Parent Repositories")),
+            title: ( localize(6465, "Use Customizations in Parent Repositories")),
             markdownDescription: ( localize(
-                6074,
+                6466,
                 "Controls whether to use chat customization files in parent repositories."
             )),
             default: false,
@@ -1861,9 +2071,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.SKILLS_LOCATION_KEY]: {
             type: "object",
-            title: ( localize(6075, "Agent Skills Locations")),
+            title: ( localize(6467, "Agent Skills Locations")),
             markdownDescription: ( localize(
-                6076,
+                6468,
                 "Specify location(s) of agent skills (`{0}`) that can be used in Chat Sessions. [Learn More]({1}).\n\nEach path should contain skill subfolders with SKILL.md files (e.g., add `my-skills` if you have `my-skills/skillA/SKILL.md`). Relative paths are resolved from the root folder(s) of your workspace.",
                 SKILL_FILENAME,
                 SKILL_DOCUMENTATION_URL
@@ -1882,7 +2092,7 @@ configurationRegistry.registerConfiguration({
             propertyNames: {
                 pattern: VALID_PROMPT_FOLDER_PATTERN,
                 patternErrorMessage: ( localize(
-                    6077,
+                    6469,
                     "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported."
                 ))
             },
@@ -1899,9 +2109,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.HOOKS_LOCATION_KEY]: {
             type: "object",
-            title: ( localize(6078, "Hook File Locations")),
+            title: ( localize(6470, "Hook File Locations")),
             markdownDescription: ( localize(
-                6079,
+                6471,
                 "Specify paths to hook configuration files that define custom shell commands to execute at strategic points in an agent's workflow. [Learn More]({0}).\n\nRelative paths are resolved from the root folder(s) of your workspace. Supports Copilot hooks (`*.json`) and Claude Code hooks (`settings.json`, `settings.local.json`).",
                 HOOK_DOCUMENTATION_URL
             )),
@@ -1919,7 +2129,7 @@ configurationRegistry.registerConfiguration({
             propertyNames: {
                 pattern: VALID_PROMPT_FOLDER_PATTERN,
                 patternErrorMessage: ( localize(
-                    6080,
+                    6472,
                     "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported."
                 ))
             },
@@ -1941,9 +2151,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_CHAT_HOOKS]: {
             type: "boolean",
-            title: ( localize(6081, "Use Chat Hooks")),
+            title: ( localize(6473, "Use Chat Hooks")),
             markdownDescription: ( localize(
-                6082,
+                6474,
                 "Controls whether chat hooks are executed at strategic points during an agent's workflow. Hooks are loaded from the files configured in `#chat.hookFilesLocations#`."
             )),
             default: true,
@@ -1959,7 +2169,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.useHooks.description",
                         value: ( localize(
-                            6082,
+                            6474,
                             "Controls whether chat hooks are executed at strategic points during an agent's workflow. Hooks are loaded from the files configured in `#chat.hookFilesLocations#`."
                         ))
                     }
@@ -1968,9 +2178,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_CLAUDE_HOOKS]: {
             type: "boolean",
-            title: ( localize(6083, "Use Claude Hooks")),
+            title: ( localize(6475, "Use Claude Hooks")),
             markdownDescription: ( localize(
-                6084,
+                6476,
                 "Controls whether hooks from Claude configuration files can execute. When disabled, only Copilot-format hooks are used. Hooks are loaded from the files configured in `#chat.hookFilesLocations#`."
             )),
             default: false,
@@ -1981,9 +2191,9 @@ configurationRegistry.registerConfiguration({
         [PromptsConfig.PROMPT_FILES_SUGGEST_KEY]: {
             type: "object",
             scope: ConfigurationScope.RESOURCE,
-            title: ( localize(6085, "Prompt File Recommendations")),
+            title: ( localize(6477, "Prompt File Recommendations")),
             markdownDescription: ( localize(
-                6086,
+                6478,
                 "Configure which prompt files to recommend in the chat welcome view. Each key is a prompt file name, and the value can be `true` to always recommend, `false` to never recommend, or a [when clause](https://aka.ms/vscode-when-clause) expression like `resourceExtname == .js` or `resourceLangId == markdown`."
             )),
             default: {},
@@ -2005,7 +2215,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             description: ( localize(
-                6087,
+                6479,
                 "Controls whether to show the todo list widget above the chat input. When enabled, the widget displays todo items created by the agent and updates as progress is made."
             ))
         },
@@ -2013,21 +2223,21 @@ configurationRegistry.registerConfiguration({
             type: "string",
             default: "fixedScrolling",
             enum: ["collapsed", "collapsedPreview", "fixedScrolling"],
-            enumDescriptions: [( localize(6088, "Thinking parts will be collapsed by default.")), ( localize(
-                6089,
+            enumDescriptions: [( localize(6480, "Thinking parts will be collapsed by default.")), ( localize(
+                6481,
                 "Thinking parts will be expanded first, then collapse once we reach a part that is not thinking."
             )), ( localize(
-                6090,
+                6482,
                 "Show thinking in a fixed-height streaming panel that auto-scrolls; click header to expand to full height."
             ))],
-            description: ( localize(6091, "Controls how thinking is rendered.")),
+            description: ( localize(6483, "Controls how thinking is rendered.")),
             tags: ["experimental"]
         },
         [ChatConfiguration.ThinkingGenerateTitles]: {
             type: "boolean",
             default: true,
             description: ( localize(
-                6092,
+                6484,
                 "Controls whether to use an LLM to generate summary titles for thinking sections."
             )),
             tags: ["experimental"]
@@ -2036,12 +2246,12 @@ configurationRegistry.registerConfiguration({
             type: "string",
             default: "always",
             enum: ["off", "withThinking", "always"],
-            enumDescriptions: [( localize(6093, "Tool calls are shown separately, not collapsed into thinking.")), ( localize(
-                6094,
+            enumDescriptions: [( localize(6485, "Tool calls are shown separately, not collapsed into thinking.")), ( localize(
+                6486,
                 "Tool calls are collapsed into thinking sections when thinking is present."
-            )), ( localize(6095, "Tool calls are always collapsed, even without thinking."))],
+            )), ( localize(6487, "Tool calls are always collapsed, even without thinking."))],
             markdownDescription: ( localize(
-                6096,
+                6488,
                 "Controls how tool calls are displayed in relation to thinking sections."
             )),
             tags: ["experimental"]
@@ -2050,7 +2260,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             markdownDescription: ( localize(
-                6097,
+                6489,
                 "When enabled, terminal tool calls are displayed inside the thinking dropdown with a simplified view."
             )),
             tags: ["experimental"]
@@ -2059,7 +2269,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             markdownDescription: ( localize(
-                6098,
+                6490,
                 "When enabled, terminal tool calls are always displayed in a collapsible container with a simplified view."
             )),
             tags: ["experimental"]
@@ -2068,7 +2278,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: false,
             markdownDescription: ( localize(
-                6099,
+                6491,
                 "Post-process tool output (for example `git diff`, `ls -l`, or `npm install`) to reduce token usage before it is sent to the model."
             )),
             tags: ["preview"],
@@ -2088,7 +2298,7 @@ configurationRegistry.registerConfiguration({
                     enum: ["replace", "append"],
                     default: "append",
                     description: ( localize(
-                        6100,
+                        6492,
                         "'replace' replaces all default phrases entirely; 'append' adds your phrases to all default categories."
                     ))
                 },
@@ -2099,14 +2309,14 @@ configurationRegistry.registerConfiguration({
                     },
                     default: [],
                     description: ( localize(
-                        6101,
+                        6493,
                         "Custom loading messages to show during thinking, working progress, terminal, and tool operations."
                     ))
                 }
             },
             additionalProperties: false,
             markdownDescription: ( localize(
-                6102,
+                6494,
                 "Customize the loading messages shown during agent thinking and progress indicators. Use `\"mode\": \"replace\"` to use only your phrases, or `\"mode\": \"append\"` to add them to the defaults."
             )),
             tags: ["experimental"]
@@ -2115,14 +2325,14 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             markdownDescription: ( localize(
-                6103,
+                6495,
                 "When enabled, tool failures are automatically expanded in the chat UI to show error details."
             ))
         },
         [ChatConfiguration.AIDisabled]: {
             type: "boolean",
             description: ( localize(
-                6104,
+                6496,
                 "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."
             )),
             default: false,
@@ -2135,7 +2345,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.disableAIFeatures",
                         value: ( localize(
-                            6104,
+                            6496,
                             "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."
                         ))
                     }
@@ -2145,7 +2355,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.TitleBarSignInEnabled]: {
             type: "boolean",
             description: ( localize(
-                6105,
+                6497,
                 "Controls whether the Copilot Sign In button is shown in the title bar when signed out. When disabled, the Sign In affordance falls back to the status bar."
             )),
             default: true
@@ -2153,7 +2363,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.TitleBarOpenInAgentsWindowEnabled]: {
             type: "boolean",
             description: ( localize(
-                6106,
+                6498,
                 "Controls whether the Open in Agents Window button is shown in the title bar."
             )),
             default: true
@@ -2164,7 +2374,7 @@ configurationRegistry.registerConfiguration({
                 type: "string"
             },
             description: ( localize(
-                6107,
+                6499,
                 "List of GitHub organization logins whose members are permitted to use AI features. When set to a non-empty list, AI features are disabled until the user signs into a GitHub account that belongs to one of the specified organizations and account-level policy data has been resolved. Set to '*' to allow any authenticated GitHub or GitHub Enterprise account."
             )),
             default: [],
@@ -2177,7 +2387,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.approvedAccountOrganizations.policy.description",
                         value: ( localize(
-                            6108,
+                            6500,
                             "Setting this policy to a non-empty list activates the Approved Account gate: all AI features are disabled until the user signs into a GitHub account whose organizations intersect this list AND the account-side policy data has resolved. Comparison is case-insensitive. Use '*' as a wildcard to accept any signed-in GitHub or GHE account (use this for GHE deployments where the organization list is not surfaced)."
                         ))
                     }
@@ -2186,7 +2396,7 @@ configurationRegistry.registerConfiguration({
         },
         "chat.allowAnonymousAccess": {
             type: "boolean",
-            description: ( localize(6109, "Controls whether anonymous access is allowed in chat.")),
+            description: ( localize(6501, "Controls whether anonymous access is allowed in chat.")),
             default: false,
             included: false,
             tags: ["experimental"],
@@ -2197,7 +2407,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.GrowthNotificationEnabled]: {
             type: "boolean",
             description: ( localize(
-                6110,
+                6502,
                 "Controls whether to show a growth notification in the agent sessions view to encourage new users to try Copilot."
             )),
             default: false,
@@ -2209,7 +2419,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.RestoreLastPanelSession]: {
             type: "boolean",
             description: ( localize(
-                6111,
+                6503,
                 "Controls whether the last session is restored in panel after restart."
             )),
             default: false
@@ -2217,7 +2427,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.ExitAfterDelegation]: {
             type: "boolean",
             description: ( localize(
-                6112,
+                6504,
                 "Controls whether the chat panel automatically exits after delegating a request to another session."
             )),
             default: false,
@@ -2226,7 +2436,7 @@ configurationRegistry.registerConfiguration({
         "chat.extensionUnification.enabled": {
             type: "boolean",
             description: ( localize(
-                6113,
+                6505,
                 "Enables the unification of GitHub Copilot extensions. When enabled, all GitHub Copilot functionality is served from the GitHub Copilot Chat extension. When disabled, the GitHub Copilot and GitHub Copilot Chat extensions operate independently."
             )),
             default: true,
@@ -2238,7 +2448,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.GeneralPurposeAgentEnabled]: {
             type: "boolean",
             description: ( localize(
-                6114,
+                6506,
                 "Controls whether the built-in General Purpose agent is available as a subagent."
             )),
             default: false,
@@ -2249,9 +2459,9 @@ configurationRegistry.registerConfiguration({
         },
         [ChatConfiguration.SubagentsAllowInvocationsFromSubagents]: {
             type: "boolean",
-            description: ( localize(6115, "Allow subagents to invoke subagents.")),
+            description: ( localize(6507, "Allow subagents to invoke subagents.")),
             markdownDescription: ( localize(
-                6116,
+                6508,
                 "Controls whether subagents can invoke other subagents. When enabled, nesting is limited to a maximum depth of 5."
             )),
             default: false,
@@ -2259,20 +2469,20 @@ configurationRegistry.registerConfiguration({
                 mode: "auto"
             }
         },
-        [ChatConfiguration.ChatCustomizationHarnessSelectorEnabled]: {
+        [ChatConfiguration.CollectInstructionsInExtension]: {
             type: "boolean",
-            tags: ["preview"],
             description: ( localize(
-                6117,
-                "Controls whether the harness selector is shown in the Chat Customizations editor sidebar. When disabled, the editor always shows all customizations without filtering."
+                6509,
+                "When enabled, automatic instruction collection (.instructions.md, agent instructions, customizations index) is performed by the GitHub Copilot Chat extension instead of the core workbench."
             )),
-            default: true
+            default: false,
+            tags: ["experimental"]
         },
         [ChatConfiguration.ChatCustomizationsStructuredPreviewEnabled]: {
             type: "boolean",
             tags: ["preview"],
             description: ( localize(
-                6118,
+                6510,
                 "Controls whether the Chat Customizations editor shows a structured preview for markdown customization files (agents, skills, instructions, prompts). When disabled, the editor always opens the raw markdown in the embedded code editor."
             )),
             default: false
@@ -2280,24 +2490,44 @@ configurationRegistry.registerConfiguration({
     }
 });
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(6119, "Chat"))),
+    EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(6511, "Chat"))),
     [( new SyncDescriptor(ChatEditorInput))]
 );
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(ChatDebugEditor, ChatDebugEditorInput.ID, ( localize(6120, "Debug View"))),
+    EditorPaneDescriptor.create(ChatDebugEditor, ChatDebugEditorInput.ID, ( localize(6512, "Debug View"))),
     [( new SyncDescriptor(ChatDebugEditorInput))]
 );
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(AgentPluginEditor, AgentPluginEditor.ID, ( localize(6121, "Agent Plugin"))),
+    EditorPaneDescriptor.create(AgentPluginEditor, AgentPluginEditor.ID, ( localize(6513, "Agent Plugin"))),
     [( new SyncDescriptor(AgentPluginEditorInput))]
 );
 ( Registry.as(Extensions$2.ConfigurationMigration)).registerConfigurationMigrations([{
+    key: "chat.agentSessions.defaultConfiguration",
+    migrateFn: (value, _accessor) => ([["chat.agentSessions.defaultConfiguration", {
+        value: undefined
+    }], [ChatConfiguration.DefaultConfiguration, {
+        value
+    }]])
+}, {
     key: "chat.experimental.detectParticipant.enabled",
     migrateFn: (value, _accessor) => ([["chat.experimental.detectParticipant.enabled", {
         value: undefined
     }], ["chat.detectParticipant.enabled", {
         value: value !== false
     }]])
+}, {
+    key: "chat.useCopilotModelsForUtilityModels",
+    migrateFn: (value, valueAccessor) => {
+        const result = [["chat.useCopilotModelsForUtilityModels", {
+            value: undefined
+        }]];
+        if (typeof value === "boolean" && valueAccessor(ChatConfiguration.BYOKUtilityModelDefault) === undefined) {
+            result.push([ChatConfiguration.BYOKUtilityModelDefault, {
+                value: value ? BYOKUtilityModelDefault.Copilot : BYOKUtilityModelDefault.None
+            }]);
+        }
+        return result;
+    }
 }, {
     key: "chat.useClaudeSkills",
     migrateFn: (value, _accessor) => ([["chat.useClaudeSkills", {
@@ -2435,7 +2665,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
     _registerEditor(scheme) {
         this._editorRegistrations.set(scheme, this.editorResolverService.registerEditor(`${scheme}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localize(6119, "Chat")),
+            label: ( localize(6511, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
@@ -2487,7 +2717,7 @@ let ChatDebugResolverContribution = class ChatDebugResolverContribution {
     constructor(editorResolverService) {
         editorResolverService.registerEditor(`${ChatDebugEditorInput.RESOURCE.scheme}:**/**`, {
             id: ChatDebugEditorInput.ID,
-            label: ( localize(6120, "Debug View")),
+            label: ( localize(6512, "Debug View")),
             priority: RegisteredEditorPriority.exclusive
         }, {
             singlePerResource: true,
@@ -2526,13 +2756,13 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Di
             this.experimentService.getTreatment(treatmentId).then(value => {
                 const node = {
                     id: "chatSidebar",
-                    title: ( localize(5880, "Chat")),
+                    title: ( localize(6246, "Chat")),
                     type: "object",
                     properties: {
                         "chat.agent.maxRequests": {
                             type: "number",
                             markdownDescription: ( localize(
-                                6122,
+                                6514,
                                 "The maximum number of requests to allow per-turn when using an agent. When the limit is reached, will ask to confirm to continue."
                             )),
                             default: value ?? 50,
@@ -2569,13 +2799,13 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Di
         this.experimentService.getTreatment("chatDefaultNewSessionMode").then(value => {
             const node = {
                 id: "chatSidebar",
-                title: ( localize(5880, "Chat")),
+                title: ( localize(6246, "Chat")),
                 type: "object",
                 properties: {
                     [ChatConfiguration.DefaultNewSessionMode]: {
                         type: "string",
                         description: ( localize(
-                            6026,
+                            6409,
                             "The default mode for new chat sessions. When empty, the chat view's default mode is used."
                         )),
                         default: typeof value === "string" ? value : ""
@@ -2751,7 +2981,7 @@ let ToolReferenceNamesContribution = class ToolReferenceNamesContribution extend
         for (const tool of tools) {
             toolReferenceNameEnumValues.push(tool.toolReferenceName);
             toolReferenceNameEnumDescriptions.push(( localize(
-                6123,
+                6515,
                 "{0} - {1}",
                 tool.toolReferenceName,
                 tool.userDescription || tool.displayName
@@ -2795,6 +3025,11 @@ registerWorkbenchContribution2(
     PromptsDebugContribution,
     WorkbenchPhase.BlockRestore
 );
+registerWorkbenchContribution2(
+    AgentHostChatDebugContribution.ID,
+    AgentHostChatDebugContribution,
+    WorkbenchPhase.BlockRestore
+);
 registerWorkbenchContribution2(
     ChatLanguageModelsDataContribution.ID,
     ChatLanguageModelsDataContribution,
@@ -2865,6 +3100,11 @@ registerWorkbenchContribution2(
     ChatQuotaNotificationContribution,
     WorkbenchPhase.AfterRestored
 );
+registerWorkbenchContribution2(
+    LocalAgentDisabledInputTipContribution.ID,
+    LocalAgentDisabledInputTipContribution,
+    WorkbenchPhase.AfterRestored
+);
 registerWorkbenchContribution2(
     HasByokModelsContribution.ID,
     HasByokModelsContribution,
@@ -2881,6 +3121,11 @@ registerWorkbenchContribution2(
     BuiltinToolsContribution,
     WorkbenchPhase.Eventually
 );
+registerWorkbenchContribution2(
+    ClientToolSetsContribution.ID,
+    ClientToolSetsContribution,
+    WorkbenchPhase.Eventually
+);
 registerWorkbenchContribution2(
     UsagesToolContribution.ID,
     UsagesToolContribution,
@@ -3010,8 +3255,8 @@ registerChatPluginActions();
 registerPlanReviewFeedbackEditorActions();
 registerAction2(ConfigureToolSets);
 registerEditorFeature(ChatPasteProvidersFeature);
-agentPluginDiscoveryRegistry.register(( new SyncDescriptor(ConfiguredAgentPluginDiscovery)));
-agentPluginDiscoveryRegistry.register(( new SyncDescriptor(MarketplaceAgentPluginDiscovery)));
-agentPluginDiscoveryRegistry.register(( new SyncDescriptor(ExtensionAgentPluginDiscovery)));
-agentPluginDiscoveryRegistry.register(( new SyncDescriptor(CopilotCliAgentPluginDiscovery)));
+agentPluginDiscoveryRegistry.register(( new SyncDescriptor(ConfiguredAgentPluginDiscovery)), AgentPluginDiscoveryPriority.Configured);
+agentPluginDiscoveryRegistry.register(( new SyncDescriptor(MarketplaceAgentPluginDiscovery)), AgentPluginDiscoveryPriority.Marketplace);
+agentPluginDiscoveryRegistry.register(( new SyncDescriptor(ExtensionAgentPluginDiscovery)), AgentPluginDiscoveryPriority.Extension);
+agentPluginDiscoveryRegistry.register(( new SyncDescriptor(CopilotCliAgentPluginDiscovery)), AgentPluginDiscoveryPriority.CopilotCli);
 ChatWidget.CONTRIBS.push(ChatDynamicVariableModel);