@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

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

@@ -1,150 +1,152 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { createMarkdownCommandLink } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable, DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { isMacintosh, isWeb } 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 { 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 { 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';
 import { registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { ChatAIDisabledSettingId, ChatMicrosoftAuthenticationEnabledSettingId, mergeChatEditAutoApprovePatterns, DEFAULT_EDIT_AUTO_APPROVE_PATTERNS, ChatExternalSessionsMode } from '@codingame/monaco-vscode-api/vscode/vs/platform/chat/common/chatSettings';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { managedSettingsDisabledValue, COPILOT_ALLOW_MANAGED_HOOKS_ONLY_CONFIG, COPILOT_ALLOW_MANAGED_HOOKS_ONLY_KEY, managedSettingValue, COPILOT_STRICT_PLUGIN_ONLY_CUSTOMIZATION_CONFIG, COPILOT_STRICT_PLUGIN_ONLY_CUSTOMIZATION_KEY, COPILOT_STRICT_MARKETPLACES_KEY, COPILOT_EXTRA_MARKETPLACES_KEY, COPILOT_ENABLED_PLUGINS_KEY, COPILOT_ALLOW_MANAGED_MCP_SERVERS_ONLY_CONFIG, COPILOT_ALLOW_MANAGED_MCP_SERVERS_ONLY_KEY, COPILOT_DENIED_MCP_SERVERS_KEY, COPILOT_ALLOWED_MCP_SERVERS_KEY, COPILOT_DISABLE_BYPASS_PERMISSIONS_MODE_KEY, COPILOT_TOP_LEVEL_MODEL_KEY, COPILOT_MODEL_KEY, managedModelValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/policy/common/copilotManagedSettings';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostEnablementService';
+import { AgentHostMapLegacySettingsToManagedSettingsSettingId } from '../../../../platform/agentHost/common/agentHostManagedSettings.js';
+import { AgentHostEditAutoApprovePatternsConfigKey, AgentHostSessionSyncEnabledConfigKey, AgentHostGlobalAutoApproveEnabledConfigKey, AgentHostAutoReplyEnabledConfigKey, AgentHostShowExternalSessionsConfigKey, AgentHostMigrateLegacyCopilotCliEnabledConfigKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostSchema';
+import '../../../../platform/agentHost/common/agentHostStarter.config.contribution.js';
+import { AgentMergeSettingId } from '../../../../platform/agentHost/common/agentMerge.js';
+import { AgentHostSdkSandboxWindowsEnabledSettingId, AgentHostSdkSandboxEnabledSettingId, AgentHostAllowSignedOutWhenUsableSettingId, AgentHostAhpJsonlLoggingSettingId, CodexPreferAgentHostEditorSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService';
+import { AgentHostCopilotModelCapabilityOverridesSettingId, CopilotSubagentModelGuidanceEnabledSettingId, CopilotAutoModeTierOverrideSettingId, CopilotAutoModeTiersEnabledSettingId, AutoModeTiersExperimentName, AgentHostReasoningSummaryEnabledSettingId, AgentHostReasoningEffortOverrideSettingId, AgentHostToolSearchDeferThresholdSettingId, AgentHostToolSearchEnabledSettingId, AgentHostOpus48PromptEnabledSettingId, CopilotClaudeAdvisorEnabledSettingId, AgentHostCopilotSdkLogLevelSettingId, copilotSdkLogLevelSettingValues, AgentHostShellToolInitScriptEnabledSettingId, AgentHostCustomTerminalToolEnabledSettingId } from '@codingame/monaco-vscode-katex-common/vscode/vs/platform/agentHost/common/copilotCliConfig';
+import { CopilotSemanticSearchEnabledSettingId } from '../../../../platform/agentHost/common/semanticSearchConstants.js';
+import { reasoningEffortLevels } from '@codingame/monaco-vscode-katex-common/vscode/vs/platform/agentHost/common/reasoningEffort';
+import { ChatSessionArchiveActionWordingSettingId } from '@codingame/monaco-vscode-katex-common/vscode/vs/platform/chat/common/sessionArchiveActions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { Extensions as Extensions$1, ConfigurationScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { mcpGalleryServiceUrlConfig, mcpGalleryServiceEnablementConfig, mcpAppsEnabledConfig, mcpAutoStartConfig, McpAutoStartValue, mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
+import { DEFAULT_LOCAL_TRANSCRIPTION_MODEL } from '@codingame/monaco-vscode-api/vscode/vs/platform/localTranscription/common/localTranscription';
+import { mcpGalleryServiceUrlConfig, mcpGalleryServiceEnablementConfig, mcpAppsEnabledConfig, mcpAutoStartConfig, McpAutoStartValue, mcpDeniedServersConfig, mcpAllowedServersConfig, mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
+import '../../../../platform/networkFilter/common/networkFilterService.js';
+import { AgentNetworkDomainSettingId } from '../../../../platform/networkFilter/common/settings.js';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { AgentSandboxEnabledValue, AgentSandboxSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/settings';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { EditorPaneDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/editor';
 import { Extensions as Extensions$2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/configuration';
-import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 import { ChatEntitlement } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
-import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { RegisteredEditorPriority } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { AssistedTypes, AddConfigurationType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration';
 import { mcpDiscoverySection, allDiscoverySources, discoverySourceSettingsLabel, mcpServerSamplingSection, mcpServerCollisionBehaviorSection, McpCollisionBehavior, mcpEnterpriseManagedAuthIdpSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents';
-import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatColors';
+import { autoApprovePolicyValue } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/agentHostConfigPolicy';
+import '../common/chatDebugServiceImpl.js';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
-import { ChatResponseResourceWorkbenchContribution } from '../common/widget/chatResponseResourceFileSystemProvider.js';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatRequestOrigin';
 import '../common/chatService/chatServiceImpl.js';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-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, BYOKUtilityModelDefault, ChatPermissionLevel, ChatNotificationMode, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { ChatConfiguration, CustomizationMigrationHintMode, BYOKUtilityModelDefault, ChatDefaultPermissionLevel, ChatPermissionLevel, ChatNotificationMode, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import './agentSessionsConfiguration.js';
 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 '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import '../common/model/chatTransferService.js';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents';
+import '../common/participants/chatSlashCommands.js';
+import '../common/sessionChatPills.js';
 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';
-import { PromptLanguageFeaturesProvider } from './promptSyntax/promptFileContributions.js';
-import { HOOK_DOCUMENTATION_URL, SKILL_DOCUMENTATION_URL, AGENT_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL, PromptsType, PromptFileSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { HOOK_SCHEMA_URI, hookFileSchema } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
+import { getDocumentationUrl, PromptsType, AgentHostAgentDebugLogMaxEventsSettingId, AgentHostAgentDebugLogEnabledSettingId, PromptFileSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { ICustomizationMigrationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/customizationMigrationService.service';
+import './aiCustomization/customizationMigrationServiceImpl.js';
 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/tools/chatArtifactsService.js';
+import '../common/tools/chatTodoListService.js';
+import { LanguageModelToolsExtensionPointHandler } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 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 '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatColors';
+import { ChatResponseResourceWorkbenchContribution } from '../common/widget/chatResponseResourceFileSystemProvider.js';
+import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService';
 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';
+import { ChatAgentRecommendation } from './actions/chatAgentRecommendationActions.js';
 import { CodeBlockActionRendering, registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from './actions/chatCodeblockActions.js';
 import { ChatContextContributions } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/actions/chatContext';
 import { registerChatContextActions } from './actions/chatContextActions.js';
 import { ChatCopyActionRendering, registerChatCopyActions } from './actions/chatCopyActions.js';
+import { ChatModelFeedbackSurveyActionRendering, registerChatModelFeedbackSurveyActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatModelFeedbackSurveyActions';
+import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/feedbackSurvey/chatModelFeedbackSurveyService';
+import { ChatModelFeedbackSurveyPromptContribution } from './feedbackSurvey/chatModelFeedbackSurveyPromptContribution.js';
 import { registerChatDeveloperActions } from './actions/chatDeveloperActions.js';
+import { registerChatElicitationActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatElicitationActions';
 import { registerChatExecuteActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { registerChatFileTreeActions } from './actions/chatFileTreeActions.js';
+import { registerChatFindActions } from './actions/chatFindActions.js';
 import { ChatGettingStartedContribution } from './actions/chatGettingStarted.js';
 import { registerChatExportActions } from './actions/chatImportExport.js';
 import { registerLanguageModelActions } from './actions/chatLanguageModelActions.js';
-import { registerChatPluginActions } from './actions/chatPluginActions.js';
 import { registerMoveActions } from './actions/chatMoveActions.js';
 import { registerNewChatActions } from './actions/chatNewActions.js';
+import { registerChatOpenAgentDebugPanelAction } from './actions/chatOpenAgentDebugPanelAction.js';
+import { registerChatPluginActions } from './actions/chatPluginActions.js';
 import { registerChatPromptNavigationActions } from './actions/chatPromptNavigationActions.js';
 import { registerChatQueueActions } from './actions/chatQueueActions.js';
 import { registerQuickChatActions } from './actions/chatQuickInputActions.js';
-import { ChatAgentRecommendation } from './actions/chatAgentRecommendationActions.js';
+import { registerChatSpeechToTextActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatSpeechToTextActions';
 import { registerChatTitleActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
-import { registerChatElicitationActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatElicitationActions';
 import { registerChatToolActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatToolActions';
 import { ChatTransferContribution } from './actions/chatTransfer.js';
-import { registerChatOpenAgentDebugPanelAction } from './actions/chatOpenAgentDebugPanelAction.js';
-import '../common/chatDebugServiceImpl.js';
-import { ChatDebugEditor } from './chatDebug/chatDebugEditor.js';
-import { PromptsDebugContribution } from './promptsDebugContribution.js';
+import { CONFIGURE_DICTATION_INSTRUCTIONS_ACTION_ID, registerConfigureSpeechInstructionsActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/configureVoiceInstructionsAction';
+import './agentSessions/agentSessions.contribution.js';
 import { AgentHostChatDebugContribution } from './chatDebug/agentHostChatDebugProvider.js';
+import { ChatDebugEditor } from './chatDebug/chatDebugEditor.js';
 import { ChatDebugEditorInput, ChatDebugEditorInputSerializer } from './chatDebug/chatDebugEditorInput.js';
-import './agentSessions/agentSessions.contribution.js';
+import './chatGoalSummaryService.js';
+import { PromptsDebugContribution } from './promptsDebugContribution.js';
+import { PromptLanguageFeaturesProvider } from './promptSyntax/promptFileContributions.js';
+import { DictationSettingId, DICTATION_MAI_MODEL_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/speechToText/chatSpeechToTextService';
+import { IChatSpeechToTextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/speechToText/chatSpeechToTextService.service';
+import './speechToText/voiceCodeTranscriptionClient.js';
+import './telemetry/chatEditorTopologyTelemetry.js';
+import './telemetry/chatModelCountTelemetry.js';
+import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService';
+import { ClientToolSetsContribution } from './tools/clientToolSetsContribution.js';
+import { RenameToolContribution } from './tools/renameTool.js';
+import { UsagesToolContribution } from './tools/usagesTool.js';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/voiceClient/micCaptureService';
+import './voiceClient/ttsPlaybackService.js';
+import './voiceClient/voiceClientService.js';
+import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/voiceClient/voiceSessionController';
+import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/voiceClient/voiceToolDispatchService';
+import './voiceInputMode/voiceInputMode.js';
+import { ChatVoiceInputModeAction, ChatVoiceInputModeToggleListenAction, registerVoiceInputModeSimulateActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/voiceInputMode/voiceInputModeActionViewItem';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { ChatViewId, isIChatViewViewContext, isIChatResourceViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
-import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { AICustomizationManagementCommands } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 import './accessibility/chatAccessibilityService.js';
-import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentModel';
-import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService';
-import './attachments/chatAttachmentResolveService.js';
-import '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { ChatInputBoxContentProvider } from './widget/input/editor/chatEditorInputContentProvider.js';
-import { ChatEditingEditorAccessibility } from './chatEditing/chatEditingEditorAccessibility.js';
-import { registerChatEditorActions } from './chatEditing/chatEditingEditorActions.js';
-import { ChatEditingEditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
-import { ChatEditingEditorOverlay } from './chatEditing/chatEditingEditorOverlay.js';
-import './chatEditing/chatEditingServiceImpl.js';
-import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
-import { ChatEditor } from './widgetHosts/editor/chatEditor.js';
-import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
-import './widget/chatLayoutService.js';
-import { ChatLanguageModelsDataContribution } from './languageModelsConfigurationService.js';
-import './chatManagement/chatManagement.contribution.js';
-import './aiCustomization/aiCustomizationWorkspaceService.js';
-import './aiCustomization/customizationHarnessService.js';
-import './aiCustomization/aiCustomizationManagement.contribution.js';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
@@ -153,66 +155,113 @@ 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/lazy';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-chat/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-terminal/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-resource-watch/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation-run/state';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 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';
-import { ChatPasteProvidersFeature } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/widget/input/editor/chatPasteProviders';
-import './widgetHosts/chatQuick.js';
-import { ChatResponseAccessibleView } from './accessibility/chatResponseAccessibleView.js';
-import { ChatTerminalOutputAccessibleView } from './accessibility/chatTerminalOutputAccessibleView.js';
-import { ChatSetupContribution, ChatTeardownContribution } from './chatSetup/chatSetupContributions.js';
-import { ChatQuotaNotificationContribution } from './chatQuotaNotification.js';
-import { HasByokModelsContribution } from './hasByokModelsContribution.js';
-import { ChatStatusBarEntry } from './chatStatus/chatStatusEntry.js';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatVariables';
-import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
-import { ChatImplicitContextContribution } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatImplicitContext';
-import './widget/input/editor/chatInputCompletions.js';
-import './widget/input/editor/agentHostInputCompletions.js';
-import './widget/input/editor/chatInputEditorContrib.js';
-import './widget/input/editor/chatInputEditorHover.js';
-import './tools/languageModelToolsConfirmationService.js';
-import { globalAutoApproveDescription } from './tools/languageModelToolsService.js';
-import './tools/toolResultCompressorService.js';
+import './aiCustomization/aiCustomizationManagement.contribution.js';
+import './aiCustomization/aiCustomizationWorkspaceService.js';
+import './aiCustomization/customizationHarnessService.js';
+import { CustomizationMigrationCategoryId } from './aiCustomization/customizationMigrationCategories.js';
+import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentModel';
+import './attachments/chatAttachmentResolveService.js';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { ChatReferenceAttachmentWidgetContribution } from './attachments/chatReferenceAttachmentWidget.contribution.js';
+import { TranscriptContextAttachmentWidgetContribution } from './attachments/transcriptContextAttachmentWidget.contribution.js';
+import { ChatViewId, isIChatViewViewContext, isIChatResourceViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatEditingEditorAccessibility } from './chatEditing/chatEditingEditorAccessibility.js';
+import { registerChatEditorActions } from './chatEditing/chatEditingEditorActions.js';
+import { ChatEditingEditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
+import { ChatEditingEditorOverlay } from './chatEditing/chatEditingEditorOverlay.js';
+import './chatEditing/chatEditingServiceImpl.js';
+import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
+import './chatManagement/chatManagement.contribution.js';
+import { ChatOutlineCreator } from './chatOutlineCreator.js';
+import { ChatLanguageModelsDataContribution } from './languageModelsConfigurationService.js';
+import '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import './widget/chatLayoutService.js';
+import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNoticeHost';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService';
+import { ChatInputBoxContentProvider } from './widget/input/editor/chatEditorInputContentProvider.js';
+import { ChatEditor } from './widgetHosts/editor/chatEditor.js';
+import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 import { ConfiguredAgentPluginDiscovery, MarketplaceAgentPluginDiscovery, ExtensionAgentPluginDiscovery, CopilotCliAgentPluginDiscovery } from '../common/plugins/agentPluginServiceImpl.js';
-import '../common/plugins/pluginMarketplaceService.js';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService';
 import '../common/plugins/workspacePluginSettingsService.js';
-import { AgentPluginRecommendations } from './claudePluginRecommendations.js';
+import { VALID_PROMPT_FOLDER_PATTERN } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator';
+import { ChatResponseAccessibleView } from './accessibility/chatResponseAccessibleView.js';
+import { ChatTerminalOutputAccessibleView } from './accessibility/chatTerminalOutputAccessibleView.js';
+import { AgentPluginCommandsContribution } from './agentPluginCommands.js';
 import { AgentPluginEditor } from './agentPluginEditor/agentPluginEditor.js';
 import { AgentPluginEditorInput } from './agentPluginEditor/agentPluginEditorInput.js';
 import './agentPluginRepositoryService.js';
+import './agentSessions/sessionSummaryHover.js';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { ChatImplicitContextContribution } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatImplicitContext';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatVariables';
+import './chatImageCarouselService.js';
+import './chatOutputItemRenderer.js';
+import { ChatExtensionPointHandler, ChatCompatibilityNotifier } from './chatParticipant.contribution.js';
+import { ChatPetAchievementsAccessibilityHelp, ChatPetContextContribution, ChatPetCustomizationAchievementContribution, ChatPetEditingAchievementContribution } from './chatPetAchievements.contribution.js';
+import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatPetService';
+import './widget/chatPetWidgetService.js';
+import { ChatPromoNotificationContribution } from './chatPromoNotification.js';
+import { ChatExpNotificationContribution } from './expNotification/chatExpNotificationContribution.js';
+import { ChatQuotaNotificationContribution } from './chatQuotaNotification.js';
+import { ChatRepoInfoContribution } from './chatRepoInfo.js';
+import { ChatSetupContribution, ChatTeardownContribution } from './chatSetup/chatSetupContributions.js';
+import { ChatSlashCommandsContribution, ChatSessionOptionSlashCommandsContribution } from './chatSlashCommands.js';
+import { ChatStatusBarEntry } from './chatStatus/chatStatusEntry.js';
+import './chatTipService.js';
+import { ChatWindowNotifier } from './chatWindowNotifier.js';
+import { AgentPluginRecommendations } from './claudePluginRecommendations.js';
+import { ExploreAgentDefaultModel } from './exploreAgentDefaultModel.js';
+import { HasByokModelsContribution } from './hasByokModelsContribution.js';
+import { PlanAgentDefaultModel } from './planAgentDefaultModel.js';
+import './planReviewFeedback/planReviewFeedbackEditorOverlay.js';
+import './planReviewFeedback/planReviewFeedbackService.js';
+import { PluginAutoUpdate } from './pluginAutoUpdate.js';
 import './pluginGitCommandService.js';
 import './pluginInstallService.js';
-import { PluginAutoUpdate } from './pluginAutoUpdate.js';
+import { PluginUrlHandler } from './pluginUrlHandler.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';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
-import { PluginUrlHandler } from './pluginUrlHandler.js';
 import { PromptUrlHandler } from './promptSyntax/promptUrlHandler.js';
+import './promptTimeline/promptTimeline.contribution.js';
+import './tools/languageModelToolsConfirmationService.js';
+import { globalAutoApproveDescription } from './tools/languageModelToolsService.js';
+import './tools/toolResultCompressorService.js';
 import { UserToolSetsContributions, ConfigureToolSets } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/tools/toolSetsContribution';
+import { UtilitySmallModelContribution, UtilityModelContribution } from './utilityModelContribution.js';
 import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
+import './widget/chatContentParts/chatSubagentOpenChat.js';
+import { ChatFindAccessibilityHelp } from './widget/chatFind/chatFindAccessibilityHelp.js';
+import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
 import './widget/chatWidgetService.js';
-import { ChatWindowNotifier } from './chatWindowNotifier.js';
-import { ChatRepoInfoContribution } from './chatRepoInfo.js';
-import { VALID_PROMPT_FOLDER_PATTERN } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator';
-import './chatTipService.js';
 import { ChatQueuePickerRendering } from './widget/input/chatQueuePickerActionItem.js';
-import { ExploreAgentDefaultModel } from './exploreAgentDefaultModel.js';
-import { PlanAgentDefaultModel } from './planAgentDefaultModel.js';
-import { UtilitySmallModelContribution, UtilityModelContribution } from './utilityModelContribution.js';
-import './chatImageCarouselService.js';
+import './widget/input/editor/agentHostInputCompletions.js';
+import './widget/input/editor/chatInputCommandArgumentHint.js';
+import './widget/input/editor/chatInputCompletions.js';
+import './widget/input/editor/chatInputEditorContrib.js';
+import './widget/input/editor/chatInputEditorHover.js';
+import { ChatPasteProvidersFeature } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/widget/input/editor/chatPasteProviders';
+import './widgetHosts/chatQuick.js';
 import '../../notebook/browser/controller/chat/notebook.chat.contribution.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';
@@ -225,15 +274,33 @@ const toolReferenceNameEnumDescriptions = [];
 const jsonContributionRegistry = ( Registry.as(Extensions.JSONContribution));
 jsonContributionRegistry.registerSchema(HOOK_SCHEMA_URI, hookFileSchema);
 const configurationRegistry = ( Registry.as(Extensions$1.Configuration));
+const migrateLocationSettingsLink = createMarkdownCommandLink({
+    id: AICustomizationManagementCommands.OpenEditor,
+    text: ( localize(7163, "Migrate Location Settings")),
+    tooltip: ( localize(7164, "Open Migrate Location Settings")),
+    arguments: [{
+        migration: true,
+        migrationCategory: CustomizationMigrationCategoryId.ConfiguredLocations
+    }]
+});
+const migratePromptFilesLink = createMarkdownCommandLink({
+    id: AICustomizationManagementCommands.OpenEditor,
+    text: ( localize(7165, "Migrate Prompt Files")),
+    tooltip: ( localize(7166, "Open Migrate Prompt Files")),
+    arguments: [{
+        migration: true,
+        migrationCategory: CustomizationMigrationCategoryId.PromptFiles
+    }]
+});
 configurationRegistry.registerConfiguration({
     id: "chatSidebar",
-    title: ( localize(6246, "Chat")),
+    title: ( localize(7167, "Chat")),
     type: "object",
     properties: {
         "chat.experimentalSessionsWindowOverride": {
             type: "boolean",
             description: ( localize(
-                6247,
+                7168,
                 "When true, enables sessions-window-specific behavior for extensions."
             )),
             default: false,
@@ -242,43 +309,187 @@ configurationRegistry.registerConfiguration({
                 default: true
             }
         },
+        "chat.experimentalModelPicker": {
+            type: "boolean",
+            description: ( localize(
+                7169,
+                "When enabled, the model picker uses a tab per model provider and configures thinking effort and context from a detail card next to each model, instead of a separate configuration button."
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
+        },
+        [ChatConfiguration.ExperimentalModePermissionsPicker]: {
+            type: "boolean",
+            description: ( localize(
+                7170,
+                "Shows mode and permissions in a combined picker with expandable permission choices for Copilot Agent Host sessions."
+            )),
+            default: product.quality !== "stable",
+            tags: ["experimental"]
+        },
         "chat.fontSize": {
             type: "number",
-            description: ( localize(6248, "Controls the font size in pixels in chat messages.")),
+            description: ( localize(7171, "Controls the font size in pixels in chat messages.")),
             default: 13,
             minimum: 6,
             maximum: 100
         },
         "chat.fontFamily": {
             type: "string",
-            description: ( localize(6249, "Controls the font family in chat messages.")),
+            description: ( localize(7172, "Controls the font family in chat messages.")),
             default: "default"
         },
+        "dictation.enabled": {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7173,
+                "Enables dictation across the product (chat input, editor, and terminal). When enabled, a microphone button appears in the chat input and the dictation shortcut becomes available. Desktop uses the selected transcription model; web uses cloud transcription."
+            )),
+            default: true,
+            tags: ["experimental"],
+            policy: {
+                name: "DictationEnabled",
+                category: PolicyCategory.InteractiveSession,
+                minimumVersion: "1.131",
+                localization: {
+                    description: {
+                        key: "dictation.enabled.policy",
+                        value: ( localize(
+                            7174,
+                            "Controls whether dictation is available across the product (chat input, editor, and terminal)."
+                        ))
+                    }
+                }
+            }
+        },
+        "dictation.model": {
+            type: "string",
+            enum: [DEFAULT_LOCAL_TRANSCRIPTION_MODEL, DICTATION_MAI_MODEL_ID],
+            enumItemLabels: [( localize(7175, "Nemotron 3.5 ASR (Multilingual) — On-Device")), ( localize(7176, "MAI — Cloud"))],
+            markdownEnumDescriptions: [( localize(
+                7177,
+                "NVIDIA Nemotron 3.5 multilingual streaming RNN-T, run on-device through Microsoft Foundry Local. Works offline; no audio leaves the device. Automatic language selection follows the Voice Mode language setting; when that setting is Automatic, dictation uses the configured display language when supported, then the system or browser locale, with model detection as a fallback. Downloaded on first use and cached on disk."
+            )), ( localize(
+                7178,
+                "Cloud transcription through the same Microsoft AI voice service used by Voice Mode. Requires a network connection and GitHub sign-in; audio is streamed to the service."
+            ))],
+            markdownDescription: ( localize(
+                7179,
+                "The model used for dictation. On-device models download on first use and run locally through Microsoft Foundry Local; the cloud option streams audio to the Microsoft AI voice service. On the web, user and default on-device selections use cloud transcription because local transcription is unsupported. If policy requires on-device transcription, dictation is unavailable on the web."
+            )),
+            default: isWeb ? DICTATION_MAI_MODEL_ID : DEFAULT_LOCAL_TRANSCRIPTION_MODEL,
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            },
+            policy: {
+                name: "DictationModel",
+                category: PolicyCategory.InteractiveSession,
+                minimumVersion: "1.136",
+                localization: {
+                    description: {
+                        key: "dictation.model.policy",
+                        value: ( localize(7180, "Controls the transcription model used for dictation."))
+                    },
+                    enumDescriptions: [{
+                        key: "dictation.model.nemotronMultilingual.policy",
+                        value: ( localize(
+                            7181,
+                            "Use the on-device transcription model. Audio does not leave the device."
+                        ))
+                    }, {
+                        key: "dictation.model.mai.policy",
+                        value: ( localize(
+                            7182,
+                            "Use the cloud transcription service. Audio is streamed to the service."
+                        ))
+                    }]
+                }
+            }
+        },
+        [DictationSettingId.ShowTranscript]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7183,
+                "Controls whether the transcript is shown while dictating. The final transcript is inserted when dictation ends."
+            )),
+            default: true,
+            tags: ["experimental"]
+        },
+        [DictationSettingId.ShowButton]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7184,
+                "Controls whether the dictation microphone button is shown in the chat input. When hidden, dictation can still be started with its keyboard shortcut."
+            )),
+            default: true,
+            tags: ["experimental"]
+        },
+        "dictation.experimental.llmCleanup": {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7185,
+                "Experimental: when dictation ends, the final transcript is passed through a small language model to restore punctuation, capitalization, paragraphs, and lists. Requires Copilot to be enabled; the transcript is sent to the language model for cleanup. Falls back to the raw transcript when no model is available. Use [dictation instructions](command:{0}) to customize terminology and formatting.",
+                CONFIGURE_DICTATION_INSTRUCTIONS_ACTION_ID
+            )),
+            default: true,
+            tags: ["experimental"],
+            policy: {
+                name: "DictationLLMCleanup",
+                category: PolicyCategory.InteractiveSession,
+                minimumVersion: "1.136",
+                localization: {
+                    description: {
+                        key: "dictation.experimental.llmCleanup.policy",
+                        value: ( localize(
+                            7186,
+                            "Controls whether final dictation transcripts are sent to a language model for cleanup."
+                        ))
+                    }
+                }
+            }
+        },
+        "dictation.experimental.llmCleanupModel": {
+            type: "string",
+            enum: ["auto", "copilot-utility-small", "gpt-5.6-luna"],
+            markdownDescription: ( localize(
+                7187,
+                "Controls the language model used for experimental dictation cleanup. `auto` follows the experiment-provided default."
+            )),
+            default: "auto",
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
+        },
         "chat.editor.fontSize": {
             type: "number",
-            description: ( localize(6250, "Controls the font size in pixels in chat codeblocks.")),
+            description: ( localize(7188, "Controls the font size in pixels in chat codeblocks.")),
             default: isMacintosh ? 12 : 14
         },
         "chat.editor.fontFamily": {
             type: "string",
-            description: ( localize(6251, "Controls the font family in chat codeblocks.")),
+            description: ( localize(7189, "Controls the font family in chat codeblocks.")),
             default: "default"
         },
         "chat.editor.fontWeight": {
             type: "string",
-            description: ( localize(6252, "Controls the font weight in chat codeblocks.")),
+            description: ( localize(7190, "Controls the font weight in chat codeblocks.")),
             default: "default"
         },
         "chat.editor.wordWrap": {
             type: "string",
-            description: ( localize(6253, "Controls whether lines should wrap in chat codeblocks.")),
+            description: ( localize(7191, "Controls whether lines should wrap in chat codeblocks.")),
             default: "off",
             enum: ["on", "off"]
         },
         "chat.editor.lineHeight": {
             type: "number",
             description: ( localize(
-                6254,
+                7192,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
@@ -286,12 +497,12 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.AgentStatusEnabled]: {
             type: "string",
             enum: ["hidden", "badge", "compact"],
-            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,
+            enumDescriptions: [( localize(7193, "The agent status indicator is hidden from the title bar.")), ( localize(7194, "Shows the agent status as a badge next to the command center.")), ( localize(
+                7195,
                 "Replaces the command center search box with a compact agent status indicator and unified chat widget."
             ))],
             markdownDescription: ( localize(
-                6258,
+                7196,
                 "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#`"
@@ -302,7 +513,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.UnifiedAgentsBar]: {
             type: "boolean",
             markdownDescription: ( localize(
-                6259,
+                7197,
                 "Replaces the command center search box with a unified chat and search widget."
             )),
             default: false,
@@ -311,23 +522,73 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.AgentSessionProjectionEnabled]: {
             type: "boolean",
             markdownDescription: ( localize(
-                6260,
+                7198,
                 "Controls whether Agent Session Projection mode is enabled for reviewing agent sessions in a focused workspace."
             )),
             default: false,
             tags: ["experimental"]
         },
+        [ChatConfiguration.MigrateLegacyCopilotCliSessions]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7199,
+                "Controls whether legacy extension host Copilot CLI chat sessions are migrated in place to the Agent host when opened, so their history becomes editable. When disabled, legacy sessions open as before.\n\nChanging this setting requires a restart to take effect."
+            )),
+            default: false,
+            tags: ["experimental"],
+            scope: ConfigurationScope.APPLICATION,
+            experiment: {
+                mode: "startup"
+            },
+            agentHost: {
+                key: AgentHostMigrateLegacyCopilotCliEnabledConfigKey
+            }
+        },
+        [ChatConfiguration.ShowExternalAgentSessions]: {
+            type: "string",
+            enum: [
+                ChatExternalSessionsMode.None,
+                ChatExternalSessionsMode.Recent,
+                ChatExternalSessionsMode.Last24Hours,
+                ChatExternalSessionsMode.Last7Days,
+                ChatExternalSessionsMode.Last30Days
+            ],
+            enumDescriptions: [( localize(7200, "Do not show external sessions.")), ( localize(
+                7201,
+                "Show up to the 2 most recent external sessions updated in the last 7 days. At startup, external sessions older than the second-most-recently updated local session are hidden."
+            )), ( localize(7202, "Show external sessions updated in the last 24 hours.")), ( localize(7203, "Show external sessions updated in the last 7 days.")), ( localize(7204, "Show external sessions updated in the last 30 days."))],
+            default: ChatExternalSessionsMode.Recent,
+            markdownDescription: ( localize(
+                7205,
+                "Controls which external agent sessions, created outside VS Code's Agent Host, are shown."
+            )),
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            },
+            agentHost: {
+                key: AgentHostShowExternalSessionsConfigKey
+            }
+        },
+        [ChatConfiguration.SaveBeforeSend]: {
+            type: "boolean",
+            description: ( localize(
+                7206,
+                "Controls whether all dirty editors except untitled editors are saved before sending a chat message."
+            )),
+            default: true
+        },
         "chat.implicitContext.enabled": {
             type: "object",
             description: ( localize(
-                6261,
+                7207,
                 "Enables automatically using the active editor as chat context for specified chat locations."
             )),
             additionalProperties: {
                 type: "string",
                 enum: ["never", "first", "always"],
-                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."))]
+                description: ( localize(7208, "The value for the implicit context.")),
+                enumDescriptions: [( localize(7209, "Implicit context is never enabled.")), ( localize(7210, "Implicit context is enabled for the first interaction.")), ( localize(7211, "Implicit context is always enabled."))]
             },
             default: {
                 "panel": "always"
@@ -345,7 +606,7 @@ configurationRegistry.registerConfiguration({
         "chat.implicitContext.suggestedContext": {
             type: "boolean",
             markdownDescription: ( localize(
-                6266,
+                7212,
                 "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,
@@ -356,8 +617,8 @@ configurationRegistry.registerConfiguration({
         "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)."
+                7213,
+                "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 Copilot)."
             )),
             default: true,
             tags: ["experimental"],
@@ -368,7 +629,7 @@ configurationRegistry.registerConfiguration({
         "chat.editing.autoAcceptDelay": {
             type: "number",
             markdownDescription: ( localize(
-                6268,
+                7214,
                 "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,
@@ -379,7 +640,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                6269,
+                7215,
                 "Whether to show a confirmation before removing a request and its associated edits."
             )),
             default: true
@@ -388,7 +649,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                6270,
+                7216,
                 "Whether to show a confirmation before retrying a request and its associated edits."
             )),
             default: true
@@ -396,7 +657,7 @@ configurationRegistry.registerConfiguration({
         "chat.editing.explainChanges.enabled": {
             type: "boolean",
             markdownDescription: ( localize(
-                6271,
+                7217,
                 "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,
@@ -408,7 +669,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.RevealNextChangeOnResolve]: {
             type: "boolean",
             markdownDescription: ( localize(
-                6272,
+                7218,
                 "Controls whether the editor automatically reveals the next change after keeping or undoing a chat edit."
             )),
             default: true
@@ -416,7 +677,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.OpenChangedFileInDiffEditor]: {
             type: "boolean",
             markdownDescription: ( localize(
-                6273,
+                7219,
                 "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
@@ -425,7 +686,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             scope: ConfigurationScope.APPLICATION,
             description: ( localize(
-                6274,
+                7220,
                 "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
@@ -433,9 +694,9 @@ configurationRegistry.registerConfiguration({
         "chat.upvoteAnimation": {
             type: "string",
             enum: ["off", "confetti", "floatingThumbs", "pulseWave", "radiantLines"],
-            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."))],
+            enumDescriptions: [( localize(7221, "No animation is shown.")), ( localize(7222, "Shows a confetti burst animation around the thumbs up button.")), ( localize(7223, "Shows floating thumbs up icons rising from the button.")), ( localize(7224, "Shows expanding pulse rings from the button.")), ( localize(7225, "Shows radiant lines emanating from the button."))],
             description: ( localize(
-                6280,
+                7226,
                 "Controls whether an animation is shown when clicking the thumbs up button on a chat response."
             )),
             default: "floatingThumbs"
@@ -443,54 +704,83 @@ configurationRegistry.registerConfiguration({
         "chat.experimental.detectParticipant.enabled": {
             type: "boolean",
             deprecationMessage: ( localize(
-                6281,
+                7227,
                 "This setting is deprecated. Please use `chat.detectParticipant.enabled` instead."
             )),
-            description: ( localize(6282, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(7228, "Enables chat participant autodetection for panel chat.")),
             default: null
         },
         [ChatConfiguration.IncrementalRendering]: {
             type: "boolean",
             description: ( localize(
-                6283,
+                7229,
                 "Enables incremental rendering with optional block-level animation when streaming chat responses."
             )),
             default: false,
             tags: ["experimental"]
         },
+        [ChatConfiguration.RichLinks]: {
+            type: "boolean",
+            description: ( localize(
+                7230,
+                "Controls whether supported links in chat are rendered as rich links with live metadata. Enabling this may make authenticated requests to services such as GitHub."
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
+        },
         [ChatConfiguration.IncrementalRenderingStyle]: {
             type: "string",
             enum: ["none", "fade", "rise", "blur", "scale", "slide", "reveal"],
-            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.")),
+            enumDescriptions: [( localize(7231, "No animation. Content appears instantly.")), ( localize(7232, "Simple opacity fade from 0 to 1.")), ( localize(7233, "Content fades in while rising upward.")), ( localize(7234, "Content fades in from a blurred state.")), ( localize(7235, "Content scales up from slightly smaller.")), ( localize(7236, "Content slides in from the left.")), ( localize(7237, "Content reveals top-to-bottom with a soft gradient edge."))],
+            description: ( localize(7238, "Controls the animation style for incremental rendering.")),
             default: "fade",
             tags: ["experimental"]
         },
         [ChatConfiguration.IncrementalRenderingBuffering]: {
             type: "string",
             enum: ["off", "word", "paragraph"],
-            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."))],
+            enumDescriptions: [( localize(7239, "Renders content immediately as tokens arrive.")), ( localize(7240, "Reveals content word by word.")), ( localize(7241, "Buffers content until a paragraph break before rendering."))],
             description: ( localize(
-                6295,
+                7242,
                 "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",
             tags: ["experimental"]
         },
+        [ChatConfiguration.CollapseCompletedResponses]: {
+            type: "boolean",
+            description: ( localize(
+                7243,
+                "Controls whether completed chat responses collapse intermediate work while keeping the final response visible."
+            )),
+            default: true
+        },
         "chat.detectParticipant.enabled": {
             type: "boolean",
-            description: ( localize(6296, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(7244, "Enables chat participant autodetection for panel chat.")),
             default: true
         },
+        [ChatConfiguration.ExperimentalStickyScrollEnabled]: {
+            type: "boolean",
+            description: ( localize(
+                7245,
+                "Controls whether chat requests use experimental tree-based sticky scroll instead of the sticky prompt header."
+            )),
+            default: true,
+            tags: ["experimental"]
+        },
         [ChatConfiguration.InlineReferencesStyle]: {
             type: "string",
             enum: ["box", "link"],
-            enumDescriptions: [( localize(6297, "Display file and symbol references as boxed widgets with icons.")), ( localize(
-                6298,
+            enumDescriptions: [( localize(7246, "Display file and symbol references as boxed widgets with icons.")), ( localize(
+                7247,
                 "Display file and symbol references as simple blue links without icons."
             ))],
             description: ( localize(
-                6299,
+                7248,
                 "Controls how file and symbol references are displayed in chat messages."
             )),
             default: "box"
@@ -498,7 +788,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.EditorAssociations]: {
             type: "object",
             markdownDescription: ( localize(
-                6300,
+                7249,
                 "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors for opening files from chat (for example `\"*.md\": \"vscode.markdown.preview.editor\"`)."
             )),
             additionalProperties: {
@@ -509,15 +799,15 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.NotifyWindowOnConfirmation]: {
             type: "string",
             enum: ["off", "windowNotFocused", "always"],
-            enumDescriptions: [( localize(6301, "Never show OS notifications for confirmations.")), ( localize(
-                6302,
+            enumDescriptions: [( localize(7250, "Never show OS notifications for confirmations.")), ( localize(
+                7251,
                 "Show OS notifications for confirmations when the window is not focused."
             )), ( localize(
-                6303,
+                7252,
                 "Always show OS notifications for confirmations, even when the window is focused."
             ))],
             description: ( localize(
-                6304,
+                7253,
                 "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"
@@ -525,30 +815,25 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.AutoReply]: {
             default: false,
             markdownDescription: ( localize(
-                6305,
+                7254,
                 "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",
             scope: ConfigurationScope.APPLICATION_MACHINE,
-            tags: ["experimental", "advanced"]
+            tags: ["experimental", "advanced"],
+            agentHost: {
+                key: AgentHostAutoReplyEnabledConfigKey
+            }
         },
         [ChatConfiguration.AutopilotAdvancedEnabled]: {
             type: "boolean",
             markdownDescription: ( localize(
-                6306,
+                7255,
                 "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,
             tags: ["experimental"]
         },
-        [ChatConfiguration.PlanReviewInlineEditorEnabled]: {
-            type: "boolean",
-            markdownDescription: ( localize(
-                6307,
-                "When enabled, the plan review widget mounts an editor inline, as opposed to in a separate editor tab."
-            )),
-            default: true
-        },
         [ChatConfiguration.DefaultPermissionLevel]: {
             type: "string",
             enum: [
@@ -556,20 +841,32 @@ configurationRegistry.registerConfiguration({
                 ChatPermissionLevel.AutoApprove,
                 ChatPermissionLevel.Autopilot
             ],
-            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."))],
+            enumItemLabels: [( localize(7256, "Default Permissions")), ( localize(7257, "Bypass Approvals")), ( localize(7258, "Autopilot (Preview)"))],
+            enumDescriptions: [( localize(7259, "Start new chat sessions with Default Permissions.")), ( localize(7260, "Start new chat sessions in Bypass Approvals mode.")), ( localize(7261, "Start new chat sessions in Autopilot mode."))],
             description: ( localize(
-                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."
+                7262,
+                "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 Permissions."
             )),
             default: ChatPermissionLevel.Default
         },
+        [ChatConfiguration.AssistedPermissionsEnabled]: {
+            type: "boolean",
+            default: product.quality !== "stable",
+            description: ( localize(
+                7263,
+                "Controls whether Assisted permissions is shown in Agent Host approval pickers."
+            )),
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
+        },
         [ChatConfiguration.PermissionsSandboxToggleEnabled]: {
             type: "boolean",
-            default: false,
+            default: true,
             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#`."
+                7264,
+                "Controls whether the permissions picker shows a \"Sandboxing for terminal\" toggle. Local sessions show it on the Default permissions option. Copilot Agent Host sessions show it as a session-specific setting that applies to every permission mode; changing it saves the choice only for that session. New Copilot Agent Host sessions initially follow `#chat.agentHost.sdkSandbox.enabled#` or `#chat.agentHost.sdkSandbox.enabledWindows#` when using the SDK's built-in shell tool, and `#chat.agent.sandbox.enabled#` or `#chat.agent.sandbox.enabledWindows#` when using the Agent Host terminal tool."
             )),
             tags: ["experimental"],
             experiment: {
@@ -583,37 +880,44 @@ configurationRegistry.registerConfiguration({
                 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."))],
+                    enumDescriptions: [( localize(7265, "Interactive — step-by-step collaboration.")), ( localize(7266, "Plan — plan first, execute when ready.")), ( localize(7267, "Autopilot — autonomously iterate from start to finish."))],
                     default: "interactive",
-                    description: ( localize(6319, "The starting mode for new agent sessions."))
+                    description: ( localize(7268, "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,
+                    enum: [
+                        ChatDefaultPermissionLevel.Manual,
+                        ChatDefaultPermissionLevel.Assisted,
+                        ChatDefaultPermissionLevel.AllowAll
+                    ],
+                    enumDescriptions: [( localize(7269, "Manual permissions — asks when approval settings don't apply.")), ( localize(7270, "Assisted permissions — evaluates risk before running tools.")), ( localize(7271, "Allow All — runs tool calls without asking."))],
+                    default: ChatDefaultPermissionLevel.Manual,
                     description: ( localize(
-                        6322,
-                        "The starting approval behavior for new agent sessions. If enterprise policy disables auto approval, new sessions use Default Approvals."
+                        7272,
+                        "The starting approval behavior for new agent sessions. If enterprise policy disables auto approval, new sessions use Manual permissions."
                     ))
                 }
             },
             default: {
                 mode: "interactive",
-                approvals: ChatPermissionLevel.Default
+                approvals: ChatDefaultPermissionLevel.Manual
             },
             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."
+                7273,
+                "Controls the default configuration for new agent sessions (such as Copilot). 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,
+                7274,
                 "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."
             )),
+            experiment: {
+                mode: "auto"
+            },
             policy: {
                 name: "ChatDefaultModel",
                 category: PolicyCategory.InteractiveSession,
@@ -622,13 +926,16 @@ configurationRegistry.registerConfiguration({
                 managedSettings: {
                     [COPILOT_MODEL_KEY]: {
                         type: "string"
+                    },
+                    [COPILOT_TOP_LEVEL_MODEL_KEY]: {
+                        type: "string"
                     }
                 },
                 localization: {
                     description: {
                         key: "chat.defaultModel.policy",
                         value: ( localize(
-                            6325,
+                            7275,
                             "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."
                         ))
                     }
@@ -641,11 +948,14 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             scope: ConfigurationScope.APPLICATION_MACHINE,
             tags: ["experimental"],
+            agentHost: {
+                key: AgentHostGlobalAutoApproveEnabledConfigKey
+            },
             policy: {
                 name: "ChatToolsAutoApprove",
                 category: PolicyCategory.InteractiveSession,
                 minimumVersion: "1.99",
-                value: policyData => policyData.managedSettings?.[COPILOT_DISABLE_BYPASS_PERMISSIONS_MODE_KEY] === "disable" || policyData.chat_preview_features_enabled === false ? false : undefined,
+                value: autoApprovePolicyValue,
                 managedSettings: {
                     [COPILOT_DISABLE_BYPASS_PERMISSIONS_MODE_KEY]: {
                         type: "string"
@@ -655,7 +965,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "autoApprove3.description",
                         value: ( localize(
-                            6326,
+                            7276,
                             "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."
                         ))
                     }
@@ -665,7 +975,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.SessionSyncEnabled]: {
             default: false,
             markdownDescription: ( localize(
-                6327,
+                7277,
                 "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",
@@ -682,11 +992,14 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.sessionSync.enabled.policy",
                         value: ( localize(
-                            6328,
+                            7278,
                             "Enable session sync to GitHub.com for cross-device Copilot session history. When disabled by organization policy, session data is kept local only."
                         ))
                     }
                 }
+            },
+            agentHost: {
+                key: AgentHostSessionSyncEnabledConfigKey
             }
         },
         [ChatConfiguration.SessionSyncExcludeRepositories]: {
@@ -696,30 +1009,25 @@ configurationRegistry.registerConfiguration({
             },
             default: [],
             markdownDescription: ( localize(
-                6329,
+                7279,
                 "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"]
         },
         [ChatConfiguration.AutoApproveEdits]: {
-            default: {
-                "**/*": true,
-                "**/.vscode/*.json": false,
-                "**/.git/**": false,
-                "**/{package.json,server.xml,build.rs,web.config,.gitattributes,.env,Cargo.toml}": false,
-                "**/*.{code-workspace,csproj,fsproj,vbproj,vcxproj,proj,targets,props,gradle,gradle.kts}": false,
-                "**/gradle.properties": false,
-                "**/ruby_lsp/*/addon": false,
-                "**/*.lock": false,
-                "**/*-lock.{yaml,json}": false
-            },
-            markdownDescription: ( localize(
-                6330,
+            default: DEFAULT_EDIT_AUTO_APPROVE_PATTERNS,
+            markdownDescription: ( localize(
+                7280,
                 "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",
             additionalProperties: {
                 type: "boolean"
+            },
+            scope: ConfigurationScope.APPLICATION,
+            agentHost: {
+                key: AgentHostEditAutoApprovePatternsConfigKey,
+                transform: mergeChatEditAutoApprovePatterns
             }
         },
         [ChatConfiguration.AutoApprovedUrls]: {
@@ -728,7 +1036,7 @@ configurationRegistry.registerConfiguration({
                 "https://github.com/microsoft/vscode/wiki/*": true
             },
             markdownDescription: ( localize(
-                6331,
+                7281,
                 "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",
@@ -751,7 +1059,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.EligibleForAutoApproval]: {
             default: {},
             markdownDescription: ( localize(
-                6332,
+                7282,
                 "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",
@@ -774,7 +1082,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.tools.eligibleForAutoApproval",
                         value: ( localize(
-                            6332,
+                            7282,
                             "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."
                         ))
                     }
@@ -783,7 +1091,7 @@ configurationRegistry.registerConfiguration({
         },
         [ChatConfiguration.ArtifactsEnabled]: {
             default: false,
-            description: ( localize(6333, "Controls whether the artifacts view is available in chat.")),
+            description: ( localize(7283, "Controls whether the artifacts view is available in chat.")),
             type: "boolean",
             tags: ["experimental"]
         },
@@ -795,7 +1103,7 @@ configurationRegistry.registerConfiguration({
                 }
             },
             description: ( localize(
-                6334,
+                7284,
                 "Rules for extracting artifacts from tool results by MIME type. Maps MIME type patterns (e.g. 'image/*') to group configuration."
             )),
             type: "object",
@@ -804,11 +1112,11 @@ configurationRegistry.registerConfiguration({
                 properties: {
                     groupName: {
                         type: "string",
-                        description: ( localize(6335, "Display name for the artifact group."))
+                        description: ( localize(7285, "Display name for the artifact group."))
                     },
                     onlyShowGroup: {
                         type: "boolean",
-                        description: ( localize(6336, "When true, show only the group header instead of individual items."))
+                        description: ( localize(7286, "When true, show only the group header instead of individual items."))
                     }
                 },
                 required: ["groupName"]
@@ -822,7 +1130,7 @@ configurationRegistry.registerConfiguration({
                 }
             },
             description: ( localize(
-                6337,
+                7287,
                 "Rules for extracting artifacts from written files by file path pattern. Maps glob patterns to group configuration."
             )),
             type: "object",
@@ -831,11 +1139,11 @@ configurationRegistry.registerConfiguration({
                 properties: {
                     groupName: {
                         type: "string",
-                        description: ( localize(6338, "Display name for the artifact group."))
+                        description: ( localize(7288, "Display name for the artifact group."))
                     },
                     onlyShowGroup: {
                         type: "boolean",
-                        description: ( localize(6339, "When true, show only the group header instead of individual items."))
+                        description: ( localize(7289, "When true, show only the group header instead of individual items."))
                     }
                 },
                 required: ["groupName"]
@@ -849,7 +1157,7 @@ configurationRegistry.registerConfiguration({
                 }
             },
             description: ( localize(
-                6340,
+                7290,
                 "Rules for extracting artifacts from memory tool calls by memory file path pattern. Maps glob patterns to group configuration."
             )),
             type: "object",
@@ -858,11 +1166,11 @@ configurationRegistry.registerConfiguration({
                 properties: {
                     groupName: {
                         type: "string",
-                        description: ( localize(6341, "Display name for the artifact group."))
+                        description: ( localize(7291, "Display name for the artifact group."))
                     },
                     onlyShowGroup: {
                         type: "boolean",
-                        description: ( localize(6342, "When true, show only the group header instead of individual items."))
+                        description: ( localize(7292, "When true, show only the group header instead of individual items."))
                     }
                 },
                 required: ["groupName"]
@@ -872,25 +1180,34 @@ configurationRegistry.registerConfiguration({
         "chat.undoRequests.restoreInput": {
             default: true,
             markdownDescription: ( localize(
-                6343,
+                7293,
                 "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(
-                6344,
+                7294,
                 "Enables editing of requests in the chat. This allows you to change the request content and resubmit it to the model."
             )),
             type: "string",
             enum: ["inline", "hover", "input", "none"],
             default: "inline"
         },
+        [ChatConfiguration.PasteAsAttachmentThreshold]: {
+            markdownDescription: ( localize(
+                7295,
+                "The number of characters a paste must exceed before it is added to the chat input as an attachment instead of being inserted inline. Set this to a very large number to always paste inline."
+            )),
+            type: "number",
+            minimum: 0,
+            default: 10000
+        },
         [ChatConfiguration.ChatViewSessionsEnabled]: {
             type: "boolean",
             default: true,
             description: ( localize(
-                6345,
+                7296,
                 "Show chat agent sessions when chat is empty or to the side when chat view is wide enough."
             )),
             agentsWindow: {
@@ -901,15 +1218,15 @@ configurationRegistry.registerConfiguration({
             type: "string",
             enum: ["stacked", "sideBySide"],
             enumDescriptions: [( localize(
-                6346,
+                7297,
                 "Display chat sessions vertically stacked above the chat input unless a chat session is visible."
             )), ( localize(
-                6347,
+                7298,
                 "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(
-                6348,
+                7299,
                 "Controls the orientation of the chat agent sessions view when it is shown alongside the chat."
             ))
         },
@@ -917,44 +1234,45 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: false,
             description: ( localize(
-                6349,
+                7300,
                 "Show a progress badge on the chat view when an agent session is in progress that is opened in that view."
             ))
         },
+        [ChatSessionArchiveActionWordingSettingId]: {
+            type: "string",
+            enum: ["archive", "done"],
+            enumDescriptions: [( localize(7301, "Use Archive, Archive All, Unarchive, and Unarchive All.")), ( localize(7302, "Use Mark as Done, Mark All as Done, Restore, and Restore All."))],
+            default: "done",
+            tags: ["experimental"],
+            experiment: {
+                mode: "startup"
+            },
+            description: ( localize(
+                7303,
+                "Controls the wording and icons used by actions that archive and unarchive chat sessions, as well as the label of the archived sessions section."
+            ))
+        },
         [ChatConfiguration.AgentsHandoffTipMode]: {
             type: "string",
             enum: ["hidden", "default", "custom"],
-            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."))],
+            enumDescriptions: [( localize(7304, "Never show the handoff tip.")), ( localize(7305, "Show the handoff tip with the default description.")), ( localize(7306, "Show the handoff tip with an alternate description."))],
             default: "hidden",
             tags: ["experimental"],
             experiment: {
                 mode: "startup"
             },
             description: ( localize(
-                6353,
+                7307,
                 "Controls the tip shown above the chat input offering to continue eligible agent sessions in the Agents Window."
             ))
         },
-        [ClaudePreferAgentHostAgentsSettingId]: {
+        [CodexPreferAgentHostEditorSettingId]: {
             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
+                7308,
+                "When enabled, Codex sessions opened from the regular workbench (sidebar chat) run inside the agent host process using the Codex App Server instead of the OpenAI extension. Only one Codex implementation surfaces per window. Requires `#chat.agentHost.codexAgent.enabled#`."
             )),
-            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,
+            default: product.quality !== "stable",
             tags: ["experimental"],
             experiment: {
                 mode: "startup"
@@ -963,35 +1281,46 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.ChatContextUsageEnabled]: {
             type: "boolean",
             default: true,
-            description: ( localize(6356, "Show the context window usage indicator in the chat input."))
+            description: ( localize(7309, "Show the context window usage indicator in the chat input."))
         },
-        [ChatConfiguration.ChatPersistentProgressEnabled]: {
+        [ChatConfiguration.Verbose]: {
             type: "boolean",
-            default: product.quality !== "stable",
-            description: ( localize(6357, "Always show progress in chat."))
+            default: true,
+            description: ( localize(
+                7310,
+                "Show request and completion timestamps. Hover over a completion timestamp to show the elapsed response time."
+            ))
         },
         [ChatConfiguration.ProgressBorder]: {
             type: "boolean",
             default: true,
             markdownDescription: ( localize(
-                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#`"
+                7311,
+                "Show an animated gradient border around the chat input while the agent is working or thinking. Has no effect when reduced motion is enabled."
             ))
         },
+        [ChatConfiguration.SessionStateIndicatorEnabled]: {
+            type: "boolean",
+            default: false,
+            markdownDescription: ( localize(
+                7312,
+                "Enable state indicators around chat editor sessions that are in progress, need input, or have an unvisited completion. Customize the borders with `chat.sessionStateIndicator.inProgressBorder`, `chat.sessionStateIndicator.needsInputBorder`, and `chat.sessionStateIndicator.unvisitedBorder` in `#workbench.colorCustomizations#`."
+            )),
+            tags: ["experimental"]
+        },
         [ChatConfiguration.NotifyWindowOnResponseReceived]: {
             type: "string",
             enum: ["off", "windowNotFocused", "always"],
-            enumDescriptions: [( localize(6359, "Never show OS notifications for responses.")), ( localize(
-                6360,
+            enumDescriptions: [( localize(7313, "Never show OS notifications for responses.")), ( localize(
+                7314,
                 "Show OS notifications for responses when the window is not focused."
             )), ( localize(
-                6361,
+                7315,
                 "Always show OS notifications for responses, even when the window is focused."
             ))],
             default: "windowNotFocused",
             description: ( localize(
-                6362,
+                7316,
                 "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."
             ))
         },
@@ -999,92 +1328,226 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             description: ( localize(
-                6363,
+                7317,
                 "Enables checkpoints in chat. Checkpoints allow you to restore the chat to a previous state."
             ))
         },
         "chat.checkpoints.showFileChanges": {
             type: "boolean",
-            description: ( localize(6364, "Controls whether to show chat checkpoint file changes.")),
+            description: ( localize(7318, "Controls whether to show chat checkpoint file changes.")),
             default: false
         },
-        [ChatConfiguration.TurnStatusPills]: {
-            type: "object",
+        [mcpAccessConfig]: {
+            type: "string",
+            description: ( localize(7319, "Controls access to installed Model Context Protocol servers.")),
+            enum: [McpAccessValue.None, McpAccessValue.Registry, McpAccessValue.All],
+            enumDescriptions: [( localize(7320, "No access to MCP servers.")), ( localize(
+                7321,
+                "Allows access to MCP servers listed in the registry that VS Code is connected to."
+            )), ( localize(7322, "Allow access to any installed MCP server."))],
+            default: McpAccessValue.All,
+            policy: {
+                name: "ChatMCP",
+                category: PolicyCategory.InteractiveSession,
+                minimumVersion: "1.99",
+                value: policyData => {
+                    if (policyData.mcp === false) {
+                        return McpAccessValue.None;
+                    }
+                    if (policyData.mcpAccess === "registry_only") {
+                        return McpAccessValue.Registry;
+                    }
+                    return undefined;
+                },
+                localization: {
+                    description: {
+                        key: "chat.mcp.access",
+                        value: ( localize(7319, "Controls access to installed Model Context Protocol servers."))
+                    },
+                    enumDescriptions: [{
+                        key: "chat.mcp.access.none",
+                        value: ( localize(7320, "No access to MCP servers."))
+                    }, {
+                        key: "chat.mcp.access.registry",
+                        value: ( localize(
+                            7321,
+                            "Allows access to MCP servers listed in the registry that VS Code is connected to."
+                        ))
+                    }, {
+                        key: "chat.mcp.access.any",
+                        value: ( localize(7322, "Allow access to any installed MCP server."))
+                    }]
+                }
+            }
+        },
+        [mcpAllowedServersConfig]: {
+            type: ["array", "null"],
+            items: {
+                type: "object",
+                additionalProperties: false,
+                properties: {
+                    serverName: {
+                        type: "string",
+                        minLength: 1,
+                        description: ( localize(7323, "Match a server by its configured name."))
+                    },
+                    serverUrl: {
+                        type: "string",
+                        minLength: 1,
+                        description: ( localize(
+                            7324,
+                            "Match a remote server by its URL. Supports `*` wildcards, for example `https://*.example.com/*`."
+                        ))
+                    },
+                    serverCommand: {
+                        type: "array",
+                        minItems: 1,
+                        items: {
+                            type: "string"
+                        },
+                        description: ( localize(
+                            7325,
+                            "Match a local server by its exact command invocation, given as the command followed by its arguments."
+                        ))
+                    }
+                },
+                oneOf: [{
+                    required: ["serverName"]
+                }, {
+                    required: ["serverUrl"]
+                }, {
+                    required: ["serverCommand"]
+                }]
+            },
             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."
+                7326,
+                "Enterprise-managed allowlist that controls which Model Context Protocol servers may be installed and run. When set, only servers matching an entry are permitted; any other server is blocked. Servers can be matched by name, remote URL pattern (with `*` wildcards), or local command invocation. Omit entirely to allow all servers (subject to the deny list). Delivered via enterprise policy for governance; this setting is not surfaced to end users."
             )),
-            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."
-                    ))
+            default: null,
+            scope: ConfigurationScope.APPLICATION,
+            included: false,
+            policy: {
+                name: "ChatAllowedMcpServers",
+                category: PolicyCategory.InteractiveSession,
+                minimumVersion: "1.130",
+                value: managedSettingValue(COPILOT_ALLOWED_MCP_SERVERS_KEY),
+                managedSettings: {
+                    [COPILOT_ALLOWED_MCP_SERVERS_KEY]: {
+                        type: "string"
+                    }
                 },
-                preview: {
-                    type: "boolean",
-                    default: false,
-                    description: ( localize(
-                        6367,
-                        "Show a pill to preview a Markdown or HTML file created or edited in the turn."
-                    ))
+                localization: {
+                    description: {
+                        key: "chat.mcp.allowedServers.policy",
+                        value: ( localize(
+                            7327,
+                            "Allowlist of Model Context Protocol servers. When set, only servers matching an entry may be installed or run; omit entirely to allow all servers (subject to the deny list)."
+                        ))
+                    }
                 }
+            }
+        },
+        [mcpDeniedServersConfig]: {
+            type: ["array", "null"],
+            items: {
+                type: "object",
+                additionalProperties: false,
+                properties: {
+                    serverName: {
+                        type: "string",
+                        minLength: 1,
+                        description: ( localize(7328, "Match a server by its configured name."))
+                    },
+                    serverUrl: {
+                        type: "string",
+                        minLength: 1,
+                        description: ( localize(
+                            7329,
+                            "Match a remote server by its URL. Supports `*` wildcards, for example `https://*.example.com/*`."
+                        ))
+                    },
+                    serverCommand: {
+                        type: "array",
+                        minItems: 1,
+                        items: {
+                            type: "string"
+                        },
+                        description: ( localize(
+                            7330,
+                            "Match a local server by its exact command invocation, given as the command followed by its arguments."
+                        ))
+                    }
+                },
+                oneOf: [{
+                    required: ["serverName"]
+                }, {
+                    required: ["serverUrl"]
+                }, {
+                    required: ["serverCommand"]
+                }]
             },
-            default: {
-                changes: false,
-                preview: false
-            },
-            additionalProperties: false
+            markdownDescription: ( localize(
+                7331,
+                "Enterprise-managed denylist of Model Context Protocol servers. Servers matching any entry are unconditionally blocked from being installed or run, even if they also match the allow list — deny rules always take precedence. Servers can be matched by name, remote URL pattern (with `*` wildcards), or local command invocation. Delivered via enterprise policy for governance; this setting is not surfaced to end users."
+            )),
+            default: null,
+            scope: ConfigurationScope.APPLICATION,
+            included: false,
+            policy: {
+                name: "ChatDeniedMcpServers",
+                category: PolicyCategory.InteractiveSession,
+                minimumVersion: "1.130",
+                value: managedSettingValue(COPILOT_DENIED_MCP_SERVERS_KEY),
+                managedSettings: {
+                    [COPILOT_DENIED_MCP_SERVERS_KEY]: {
+                        type: "string"
+                    }
+                },
+                localization: {
+                    description: {
+                        key: "chat.mcp.deniedServers.policy",
+                        value: ( localize(
+                            7332,
+                            "Denylist of Model Context Protocol servers. Servers matching any entry are blocked from being installed or run, even if they also match the allow list; deny rules always take precedence."
+                        ))
+                    }
+                }
+            }
         },
-        [mcpAccessConfig]: {
-            type: "string",
-            description: ( localize(6368, "Controls access to installed Model Context Protocol servers.")),
-            enum: [McpAccessValue.None, McpAccessValue.Registry, McpAccessValue.All],
-            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(6371, "Allow access to any installed MCP server."))],
-            default: McpAccessValue.All,
+        [COPILOT_ALLOW_MANAGED_MCP_SERVERS_ONLY_CONFIG]: {
+            type: "boolean",
+            default: false,
+            scope: ConfigurationScope.APPLICATION,
+            included: false,
+            description: ( localize(
+                7333,
+                "Use only the enterprise-managed MCP allowlist when deciding which servers may run."
+            )),
             policy: {
-                name: "ChatMCP",
+                name: "ChatAllowManagedMcpServersOnly",
                 category: PolicyCategory.InteractiveSession,
-                minimumVersion: "1.99",
-                value: policyData => {
-                    if (policyData.mcp === false) {
-                        return McpAccessValue.None;
-                    }
-                    if (policyData.mcpAccess === "registry_only") {
-                        return McpAccessValue.Registry;
+                minimumVersion: "1.132",
+                value: managedSettingValue(COPILOT_ALLOW_MANAGED_MCP_SERVERS_ONLY_KEY),
+                managedSettings: {
+                    [COPILOT_ALLOW_MANAGED_MCP_SERVERS_ONLY_KEY]: {
+                        type: "boolean"
                     }
-                    return undefined;
                 },
                 localization: {
                     description: {
-                        key: "chat.mcp.access",
-                        value: ( localize(6368, "Controls access to installed Model Context Protocol servers."))
-                    },
-                    enumDescriptions: [{
-                        key: "chat.mcp.access.none",
-                        value: ( localize(6369, "No access to MCP servers."))
-                    }, {
-                        key: "chat.mcp.access.registry",
+                        key: "chat.mcp.allowManagedServersOnly.policy",
                         value: ( localize(
-                            6370,
-                            "Allows access to MCP servers installed from the registry that VS Code is connected to."
+                            7334,
+                            "Use only the enterprise-managed MCP allowlist when deciding which servers may run."
                         ))
-                    }, {
-                        key: "chat.mcp.access.any",
-                        value: ( localize(6371, "Allow access to any installed MCP server."))
-                    }]
+                    }
                 }
             }
         },
         [mcpAutoStartConfig]: {
             type: "string",
             description: ( localize(
-                6372,
+                7335,
                 "Controls whether MCP servers should be automatically started when the chat messages are submitted."
             )),
             default: McpAutoStartValue.NewAndOutdated,
@@ -1093,8 +1556,8 @@ configurationRegistry.registerConfiguration({
                 McpAutoStartValue.OnlyNew,
                 McpAutoStartValue.NewAndOutdated
             ],
-            enumDescriptions: [( localize(6373, "Never automatically start MCP servers.")), ( localize(6374, "Only automatically start new MCP servers that have never been run.")), ( localize(
-                6375,
+            enumDescriptions: [( localize(7336, "Never automatically start MCP servers.")), ( localize(7337, "Only automatically start new MCP servers that have never been run.")), ( localize(
+                7338,
                 "Automatically start new and outdated MCP servers that are not yet running."
             ))],
             tags: ["experimental"]
@@ -1102,7 +1565,7 @@ configurationRegistry.registerConfiguration({
         [mcpAppsEnabledConfig]: {
             type: "boolean",
             description: ( localize(
-                6376,
+                7339,
                 "Controls whether MCP servers can provide custom UI for tool invocations."
             )),
             default: true,
@@ -1120,27 +1583,27 @@ configurationRegistry.registerConfiguration({
                     type: "string",
                     format: "uri",
                     markdownDescription: ( localize(
-                        6377,
+                        7340,
                         "The OAuth/OIDC issuer URL of the SSO authorization server. Must be an `https://` URL."
                     ))
                 },
                 clientId: {
                     type: "string",
                     markdownDescription: ( localize(
-                        6378,
+                        7341,
                         "The OAuth client ID registered with the SSO issuer for this device."
                     ))
                 },
                 clientSecret: {
                     type: "string",
                     markdownDescription: ( localize(
-                        6379,
+                        7342,
                         "The OAuth client secret paired with `clientId`. Intended for local development only."
                     ))
                 }
             },
             markdownDescription: ( localize(
-                6380,
+                7343,
                 "(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: {
@@ -1151,7 +1614,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "mcp.enterpriseManagedAuth.idp.policy",
                         value: ( localize(
-                            6381,
+                            7344,
                             "The OAuth/OIDC IdP configuration used for enterprise-managed Model Context Protocol (MCP) server authentication."
                         ))
                     }
@@ -1161,19 +1624,19 @@ configurationRegistry.registerConfiguration({
         [mcpServerCollisionBehaviorSection]: {
             type: "string",
             description: ( localize(
-                6382,
+                7345,
                 "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(6383, "Disable lower-priority servers with duplicate names.")), ( localize(6384, "Append numeric suffixes to servers with duplicate names."))],
+            enumDescriptions: [( localize(7346, "Disable lower-priority servers with duplicate names.")), ( localize(7347, "Append numeric suffixes to servers with duplicate names."))],
             default: McpCollisionBehavior.Disable
         },
         [mcpServerSamplingSection]: {
             type: "object",
             description: ( localize(
-                6385,
+                7348,
                 "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(6386, "List Servers"))
+                "MCP: " + ( localize(7349, "List Servers"))
             )),
             scope: ConfigurationScope.RESOURCE,
             additionalProperties: {
@@ -1182,7 +1645,7 @@ configurationRegistry.registerConfiguration({
                     allowedDuringChat: {
                         type: "boolean",
                         description: ( localize(
-                            6387,
+                            7350,
                             "Whether this server is allowed to make sampling requests during its tool calls in a chat session."
                         )),
                         default: true
@@ -1190,7 +1653,7 @@ configurationRegistry.registerConfiguration({
                     allowedOutsideChat: {
                         type: "boolean",
                         description: ( localize(
-                            6388,
+                            7351,
                             "Whether this server is allowed to make sampling requests outside of a chat session."
                         )),
                         default: false
@@ -1199,7 +1662,7 @@ configurationRegistry.registerConfiguration({
                         type: "array",
                         items: {
                             type: "string",
-                            description: ( localize(6389, "A model the MCP server has access to."))
+                            description: ( localize(7352, "A model the MCP server has access to."))
                         }
                     }
                 }
@@ -1208,7 +1671,7 @@ configurationRegistry.registerConfiguration({
         [AssistedTypes[AddConfigurationType.NuGetPackage].enabledConfigKey]: {
             type: "boolean",
             description: ( localize(
-                6390,
+                7353,
                 "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,
@@ -1219,7 +1682,7 @@ configurationRegistry.registerConfiguration({
         },
         [ChatConfiguration.ExtensionToolsEnabled]: {
             type: "boolean",
-            description: ( localize(6391, "Enable using tools contributed by third-party extensions.")),
+            description: ( localize(7354, "Enable using tools contributed by third-party extensions.")),
             default: true,
             policy: {
                 name: "ChatAgentExtensionTools",
@@ -1228,14 +1691,14 @@ configurationRegistry.registerConfiguration({
                 localization: {
                     description: {
                         key: "chat.extensionToolsEnabled",
-                        value: ( localize(6391, "Enable using tools contributed by third-party extensions."))
+                        value: ( localize(7354, "Enable using tools contributed by third-party extensions."))
                     }
                 }
             }
         },
         [ChatConfiguration.PluginsEnabled]: {
             type: "boolean",
-            description: ( localize(6392, "Enable agent plugin integration in chat.")),
+            description: ( localize(7355, "Enable agent plugin integration in chat.")),
             default: true,
             policy: {
                 name: "ChatPluginsEnabled",
@@ -1244,7 +1707,7 @@ configurationRegistry.registerConfiguration({
                 localization: {
                     description: {
                         key: "chat.plugins.enabled",
-                        value: ( localize(6392, "Enable agent plugin integration in chat."))
+                        value: ( localize(7355, "Enable agent plugin integration in chat."))
                     }
                 }
             }
@@ -1256,7 +1719,7 @@ configurationRegistry.registerConfiguration({
             },
             restricted: true,
             markdownDescription: ( localize(
-                6393,
+                7356,
                 "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,
@@ -1268,8 +1731,8 @@ configurationRegistry.registerConfiguration({
                 type: "boolean"
             },
             markdownDescription: ( localize(
-                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.",
+                7357,
+                "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, entries are additive: plugins mapped to `true` are enabled in addition to the user's own plugins, and only plugins mapped to `false` are blocked from loading.",
                 `\`#${ChatConfiguration.PluginLocations}#\``,
                 `\`#${ChatConfiguration.PluginMarketplaces}#\``
             )),
@@ -1288,7 +1751,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.plugins.enabledPlugins.policy",
                         value: ( localize(
-                            6395,
+                            7358,
                             "Plugin enablement. Keys are plugin IDs in `{plugin}@{marketplace}` form; values enable or disable the plugin."
                         ))
                     }
@@ -1301,7 +1764,7 @@ configurationRegistry.registerConfiguration({
                 type: "string"
             },
             markdownDescription: ( localize(
-                6396,
+                7359,
                 "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"],
@@ -1317,9 +1780,10 @@ configurationRegistry.registerConfiguration({
             scope: ConfigurationScope.APPLICATION,
             included: false,
             markdownDescription: ( localize(
-                6397,
-                "Enterprise-managed additional plugin marketplaces. Unioned with {0}.",
-                `\`#${ChatConfiguration.PluginMarketplaces}#\``
+                7360,
+                "Enterprise-managed additional plugin marketplaces. Unioned with {0}. An entry's `autoUpdate` value overrides {1} for plugins from that marketplace.",
+                `\`#${ChatConfiguration.PluginMarketplaces}#\``,
+                "`#extensions.autoUpdate#`"
             )),
             policy: {
                 name: "ChatExtraMarketplaces",
@@ -1335,8 +1799,8 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.plugins.extraMarketplaces.policy",
                         value: ( localize(
-                            6398,
-                            "Additional plugin marketplaces to query. Keys are marketplace names; values are GitHub shorthand (`owner/repo[#ref]`) or Git URIs (`{url}[#ref]`)."
+                            7361,
+                            "Additional plugin marketplaces to query. Keys are marketplace names; values are GitHub shorthand (`owner/repo[#ref]`) or Git URIs (`{url}[#ref]`), optionally with an enterprise-managed auto-update override."
                         ))
                     }
                 }
@@ -1391,7 +1855,7 @@ configurationRegistry.registerConfiguration({
                 required: ["source"]
             },
             markdownDescription: ( localize(
-                6399,
+                7362,
                 "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: null,
@@ -1412,17 +1876,77 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.plugins.strictMarketplaces.policy",
                         value: ( localize(
-                            6400,
+                            7363,
                             "Allowlist of plugin marketplace sources. When set, only marketplaces matching an entry are trusted; an empty array blocks all marketplaces."
                         ))
                     }
                 }
             }
         },
+        [COPILOT_STRICT_PLUGIN_ONLY_CUSTOMIZATION_CONFIG]: {
+            type: "boolean",
+            default: false,
+            scope: ConfigurationScope.APPLICATION,
+            included: false,
+            description: ( localize(
+                7364,
+                "Blocks standalone user and workspace skills, agents, hooks, instructions, and MCP servers while keeping eligible plugin customizations available."
+            )),
+            policy: {
+                name: "ChatStrictPluginOnlyCustomization",
+                category: PolicyCategory.InteractiveSession,
+                minimumVersion: "1.132",
+                value: managedSettingValue(COPILOT_STRICT_PLUGIN_ONLY_CUSTOMIZATION_KEY),
+                managedSettings: {
+                    [COPILOT_STRICT_PLUGIN_ONLY_CUSTOMIZATION_KEY]: {
+                        type: "boolean"
+                    }
+                },
+                localization: {
+                    description: {
+                        key: "chat.customizations.strictPluginOnlyCustomization.policy",
+                        value: ( localize(
+                            7365,
+                            "Blocks standalone user and workspace skills, agents, hooks, instructions, and MCP servers while keeping eligible plugin customizations available."
+                        ))
+                    }
+                }
+            }
+        },
+        [COPILOT_ALLOW_MANAGED_HOOKS_ONLY_CONFIG]: {
+            type: "boolean",
+            default: false,
+            scope: ConfigurationScope.APPLICATION,
+            included: false,
+            description: ( localize(
+                7366,
+                "Allows hooks only from enterprise-managed sources and plugins force-enabled by policy."
+            )),
+            policy: {
+                name: "ChatAllowManagedHooksOnly",
+                category: PolicyCategory.InteractiveSession,
+                minimumVersion: "1.132",
+                value: managedSettingValue(COPILOT_ALLOW_MANAGED_HOOKS_ONLY_KEY),
+                managedSettings: {
+                    [COPILOT_ALLOW_MANAGED_HOOKS_ONLY_KEY]: {
+                        type: "boolean"
+                    }
+                },
+                localization: {
+                    description: {
+                        key: "chat.hooks.allowManagedOnly.policy",
+                        value: ( localize(
+                            7367,
+                            "Allows hooks only from enterprise-managed sources and plugins force-enabled by policy."
+                        ))
+                    }
+                }
+            }
+        },
         [ChatConfiguration.AgentEnabled]: {
             type: "boolean",
             description: ( localize(
-                6401,
+                7368,
                 "When enabled, agent mode can be activated from chat and tools in agentic contexts with side effects can be used."
             )),
             default: true,
@@ -1436,7 +1960,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.agent.enabled.description",
                         value: ( localize(
-                            6401,
+                            7368,
                             "When enabled, agent mode can be activated from chat and tools in agentic contexts with side effects can be used."
                         ))
                     }
@@ -1445,14 +1969,15 @@ configurationRegistry.registerConfiguration({
         },
         [AgentNetworkDomainSettingId.NetworkFilter]: {
             markdownDescription: ( localize(
-                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.",
+                7369,
+                "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.\n\nChanges may not take full effect until VS Code is restarted.",
                 `\`#${AgentNetworkDomainSettingId.AllowedNetworkDomains}#\``,
                 `\`#${AgentNetworkDomainSettingId.DeniedNetworkDomains}#\``,
                 `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``
             )),
             type: "boolean",
             default: false,
+            scope: ConfigurationScope.APPLICATION,
             restricted: true,
             policy: {
                 name: "ChatAgentNetworkFilter",
@@ -1462,8 +1987,8 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.agent.networkFilter",
                         value: ( localize(
-                            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.",
+                            7369,
+                            "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.\n\nChanges may not take full effect until VS Code is restarted.",
                             `\`#${AgentNetworkDomainSettingId.AllowedNetworkDomains}#\``,
                             `\`#${AgentNetworkDomainSettingId.DeniedNetworkDomains}#\``,
                             `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``
@@ -1474,8 +1999,8 @@ configurationRegistry.registerConfiguration({
         },
         [AgentNetworkDomainSettingId.AllowedNetworkDomains]: {
             markdownDescription: ( localize(
-                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.",
+                7370,
+                "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.\n\nChanges may not take full effect until VS Code is restarted.",
                 `\`#${AgentNetworkDomainSettingId.NetworkFilter}#\``,
                 `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``,
                 `\`#${AgentSandboxSettingId.AgentSandboxAllowNetwork}#\``,
@@ -1487,6 +2012,7 @@ configurationRegistry.registerConfiguration({
                 type: "string"
             },
             default: [],
+            scope: ConfigurationScope.APPLICATION,
             restricted: true,
             policy: {
                 name: "ChatAgentAllowedNetworkDomains",
@@ -1496,8 +2022,8 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.agent.allowedNetworkDomains",
                         value: ( localize(
-                            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.",
+                            7370,
+                            "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.\n\nChanges may not take full effect until VS Code is restarted.",
                             `\`#${AgentNetworkDomainSettingId.NetworkFilter}#\``,
                             `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``,
                             `\`#${AgentSandboxSettingId.AgentSandboxAllowNetwork}#\``,
@@ -1510,8 +2036,8 @@ configurationRegistry.registerConfiguration({
         },
         [AgentNetworkDomainSettingId.DeniedNetworkDomains]: {
             markdownDescription: ( localize(
-                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}.",
+                7371,
+                "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}.\n\nChanges may not take full effect until VS Code is restarted.",
                 `\`#${AgentNetworkDomainSettingId.NetworkFilter}#\``,
                 `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``,
                 `\`#${AgentSandboxSettingId.AgentSandboxAllowNetwork}#\``,
@@ -1523,6 +2049,7 @@ configurationRegistry.registerConfiguration({
                 type: "string"
             },
             default: [],
+            scope: ConfigurationScope.APPLICATION,
             restricted: true,
             policy: {
                 name: "ChatAgentDeniedNetworkDomains",
@@ -1532,8 +2059,8 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.agent.deniedNetworkDomains",
                         value: ( localize(
-                            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}.",
+                            7371,
+                            "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}.\n\nChanges may not take full effect until VS Code is restarted.",
                             `\`#${AgentNetworkDomainSettingId.NetworkFilter}#\``,
                             `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``,
                             `\`#${AgentSandboxSettingId.AgentSandboxAllowNetwork}#\``,
@@ -1542,111 +2069,345 @@ configurationRegistry.registerConfiguration({
                         ))
                     }
                 }
-            }
-        },
-        [AgentNetworkDomainSettingId.DeprecatedOldAllowedNetworkDomains]: {
-            type: "array",
-            items: {
-                type: "string"
-            },
-            deprecated: true,
-            markdownDeprecationMessage: ( localize(
-                6405,
-                "Use {0} instead",
-                `\`#${AgentNetworkDomainSettingId.AllowedNetworkDomains}#\``
-            ))
-        },
-        [AgentNetworkDomainSettingId.DeprecatedOldDeniedNetworkDomains]: {
-            type: "array",
-            items: {
-                type: "string"
-            },
-            deprecated: true,
-            markdownDeprecationMessage: ( localize(
-                6406,
-                "Use {0} instead",
-                `\`#${AgentNetworkDomainSettingId.DeniedNetworkDomains}#\``
-            ))
-        },
-        [AgentNetworkDomainSettingId.DeprecatedSandboxAllowedNetworkDomains]: {
-            type: "array",
-            items: {
-                type: "string"
-            },
-            deprecated: true,
-            markdownDeprecationMessage: ( localize(
-                6407,
-                "Use {0} instead",
-                `\`#${AgentNetworkDomainSettingId.AllowedNetworkDomains}#\``
-            ))
-        },
-        [AgentNetworkDomainSettingId.DeprecatedSandboxDeniedNetworkDomains]: {
-            type: "array",
-            items: {
-                type: "string"
+            }
+        },
+        [ChatConfiguration.DefaultNewSessionMode]: {
+            type: "string",
+            description: ( localize(
+                7372,
+                "The default mode for new chat sessions. When empty, the chat view's default mode is used."
+            )),
+            default: ""
+        },
+        [AgentHostAhpJsonlLoggingSettingId]: {
+            type: "boolean",
+            description: ( localize(
+                7373,
+                "When enabled, logs all AHP transport messages for agent host connections to JSONL files under the window's log directory."
+            )),
+            default: product.quality !== "stable",
+            tags: ["experimental", "advanced"]
+        },
+        [AgentHostAgentDebugLogEnabledSettingId]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7374,
+                "Enable agent debug logging for agent host sessions: surface their debug events in the agent debug panel. Takes effect immediately; only sessions that run while this is enabled are captured."
+            )),
+            default: false,
+            tags: ["experimental", "advanced"],
+            experiment: {
+                mode: "startup"
+            }
+        },
+        [AgentHostAgentDebugLogMaxEventsSettingId]: {
+            type: "number",
+            minimum: 10,
+            markdownDescription: ( localize(
+                7375,
+                "Maximum number of debug events kept in memory per agent host session for the agent debug panel. Older events beyond this limit are dropped from the in-memory buffer, which also lowers the totals (such as token usage) shown in the panel overview."
+            )),
+            default: 10000,
+            tags: ["experimental", "advanced"],
+            experiment: {
+                mode: "startup"
+            }
+        },
+        [AgentHostCustomTerminalToolEnabledSettingId]: {
+            type: "boolean",
+            description: ( localize(
+                7376,
+                "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"],
+            policy: {
+                name: "ChatAgentHostCustomTerminalTool",
+                category: PolicyCategory.InteractiveSession,
+                minimumVersion: "1.137",
+                value: managedSettingsDisabledValue,
+                localization: {
+                    description: {
+                        key: "chat.agentHost.customTerminalTool.enabled.policy",
+                        value: ( localize(
+                            7377,
+                            "Enable the Agent Host custom terminal tool override for Copilot SDK sessions."
+                        ))
+                    }
+                }
+            }
+        },
+        [AgentHostShellToolInitScriptEnabledSettingId]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7378,
+                "When enabled, Copilot SDK sessions load your shell profile (`~/.bashrc` on macOS and Linux, PowerShell profiles on Windows) and activate the Python environment selected for the workspace before each shell command. Python activation requires the Python Environments extension with `#python-envs.terminal.autoActivationType#` set to `shellStartup`. Local windows only."
+            )),
+            default: false,
+            tags: ["experimental", "advanced"],
+            scope: ConfigurationScope.APPLICATION
+        },
+        [AgentHostCopilotSdkLogLevelSettingId]: {
+            type: "string",
+            enum: [...copilotSdkLogLevelSettingValues],
+            enumDescriptions: [( localize(
+                7379,
+                "Log informational messages. Running VS Code with trace logging still enables all Copilot SDK runtime diagnostics."
+            )), ( localize(7380, "Log all Copilot SDK runtime diagnostics."))],
+            markdownDescription: ( localize(
+                7381,
+                "Controls the log level for the Copilot SDK runtime used by the local agent host. Changing this setting restarts the Copilot SDK client; active sessions are reloaded when next used."
+            )),
+            default: "info",
+            scope: ConfigurationScope.APPLICATION,
+            tags: ["experimental", "advanced"]
+        },
+        [CopilotClaudeAdvisorEnabledSettingId]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7382,
+                "When enabled, Copilot Agent Host sessions using a supported Claude model can call the provider-native Advisor tool. Changing this setting restarts the Copilot SDK client after active turns finish."
+            )),
+            default: false,
+            tags: ["experimental", "advanced"],
+            scope: ConfigurationScope.APPLICATION
+        },
+        [AgentHostMapLegacySettingsToManagedSettingsSettingId]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7383,
+                "When enabled, maps supported legacy VS Code settings to equivalent Copilot SDK managed settings for local Agent Host sessions. Only restrictions are mapped, and only from globally-scoped values — workspace and folder values are ignored. Applies to local sessions using the Copilot agent; remote hosts and other agents are unaffected. This compatibility bridge is temporary and is not used for new settings."
+            )),
+            default: false,
+            scope: ConfigurationScope.APPLICATION_MACHINE,
+            tags: ["experimental", "advanced"]
+        },
+        [AgentHostOpus48PromptEnabledSettingId]: {
+            type: "boolean",
+            description: ( localize(
+                7384,
+                "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", "advanced"]
+        },
+        [AgentHostToolSearchEnabledSettingId]: {
+            type: "boolean",
+            description: ( localize(
+                7385,
+                "When enabled, Copilot SDK sessions defer MCP and non-core VS Code tools behind a tool-search tool so the model discovers them on demand instead of loading every tool definition up front."
+            )),
+            default: true,
+            tags: ["experimental", "advanced"]
+        },
+        [AgentHostToolSearchDeferThresholdSettingId]: {
+            type: "number",
+            description: ( localize(
+                7386,
+                "Minimum number of tools before MCP and external tools are deferred behind tool search. Set to 0 to always defer external tools. Only effective when tool search is enabled."
+            )),
+            default: 1,
+            minimum: 0,
+            tags: ["experimental", "advanced"]
+        },
+        [CopilotSemanticSearchEnabledSettingId]: {
+            type: "boolean",
+            description: ( localize(
+                7387,
+                "Controls whether Copilot Agent Host sessions can use VS Code's semantic workspace search. When disabled, semantic search is unavailable."
+            )),
+            default: false,
+            experiment: {
+                mode: "auto"
+            },
+            tags: ["experimental", "advanced"]
+        },
+        [AgentHostReasoningEffortOverrideSettingId]: {
+            type: "string",
+            markdownDescription: ( localize(
+                7388,
+                "Overrides the reasoning effort for Copilot SDK agent sessions regardless of the per-model picker value. Set it to a level the selected model supports (for example `low`, `medium`, `high`, or `xhigh`) — choosing a level the model does not support may be rejected by the model. A value that isn't a recognized effort level is ignored and the session falls back to the picker value. Applied when a session is created and when its model changes. Only affects Copilot CLI agent sessions.\n\n**Note**: This is an advanced setting for experimentation."
+            )),
+            default: "",
+            tags: ["experimental", "advanced"]
+        },
+        [AgentHostReasoningSummaryEnabledSettingId]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7389,
+                "When enabled, requests concise reasoning summaries for supported Copilot SDK agent sessions."
+            )),
+            default: false,
+            experiment: {
+                mode: "startup"
+            },
+            tags: ["experimental", "advanced"]
+        },
+        [CopilotAutoModeTiersEnabledSettingId]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7390,
+                "Show the Auto model's \"Optimize for\" picker with Efficiency, Balance, and Intelligence options in Copilot Chat and Copilot SDK sessions. When disabled, the service chooses how to route unless an override is configured."
+            )),
+            default: false,
+            experiment: {
+                mode: "startup",
+                name: AutoModeTiersExperimentName
+            },
+            tags: ["experimental", "advanced"]
+        },
+        [CopilotAutoModeTierOverrideSettingId]: {
+            type: ["string", "null"],
+            markdownDescription: ( localize(
+                7391,
+                "Override Auto's \"Optimize for\" preference for evals and debugging, even when the picker is disabled. Accepts `efficiency`, `balance`, or `intelligence` in both Copilot Chat and Copilot SDK sessions; `fast` is extension-only. Set to `null` to clear."
+            )),
+            default: null,
+            tags: ["advanced"]
+        },
+        [CopilotSubagentModelGuidanceEnabledSettingId]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                7392,
+                "When enabled, Copilot SDK agent sessions instruct the model to keep subagents on their default model, setting the task tool's `model` parameter only when you explicitly name the model a subagent should run on. Applied when a session launches or resumes."
+            )),
+            default: false,
+            experiment: {
+                mode: "startup"
+            },
+            tags: ["experimental", "advanced"]
+        },
+        [AgentHostCopilotModelCapabilityOverridesSettingId]: {
+            type: "object",
+            markdownDescription: ( localize(
+                7393,
+                "Per-model overrides for Copilot Agent Host sessions. Use `*` to match every model. Supports model family, reasoning effort, tool filters, model capabilities, and YAML prompt overrides."
+            )),
+            additionalProperties: {
+                type: "object",
+                properties: {
+                    family: {
+                        type: "string",
+                        description: ( localize(
+                            7394,
+                            "Route the model to another family's tuned system prompt and tool profile (e.g. `claude-opus-4.8`). The model id sent to the runtime is unaffected, so the session still runs on the selected model."
+                        ))
+                    },
+                    reasoningEffort: {
+                        type: "string",
+                        enum: [...reasoningEffortLevels],
+                        description: ( localize(
+                            7395,
+                            "Reasoning effort for sessions on this model, overriding the model picker's thinking level. Use the `*` entry to set it for every model. Unrecognized values are ignored."
+                        ))
+                    },
+                    availableTools: {
+                        type: "array",
+                        items: {
+                            type: "string"
+                        },
+                        description: ( localize(
+                            7396,
+                            "When set, only matching tools are available to sessions on this model. Patterns: bare tool names, `builtin:*` or `builtin:<name>` (Copilot runtime tools), `mcp:*` or `mcp:<name>` (MCP server tools), and `custom:*` or `custom:<name>` (every tool VS Code registers with the SDK, including the agent host's own terminal tools); a bare `*` expands to all three sources."
+                        ))
+                    },
+                    excludedTools: {
+                        type: "array",
+                        items: {
+                            type: "string"
+                        },
+                        description: ( localize(
+                            7397,
+                            "Tools disabled for sessions on this model; same pattern syntax as `availableTools` and takes precedence over it. Note that `custom:*` and a bare `*` also disable the agent host's own terminal tools registered with the SDK."
+                        ))
+                    },
+                    modelCapabilities: {
+                        type: "object",
+                        additionalProperties: true,
+                        description: ( localize(
+                            7398,
+                            "Per-property model capability overrides passed through to the Copilot SDK's `modelCapabilities` session field (e.g. `{ \"supports\": { \"vision\": false }, \"limits\": { \"max_context_window_tokens\": 64000 } }`), deep-merged over the runtime's resolved defaults for this model. Applied when the session launches or resumes."
+                        ))
+                    },
+                    promptOverrideString: {
+                        type: "string",
+                        description: ( localize(
+                            7399,
+                            "Inline YAML containing `systemPrompt` and/or `toolDescriptions` overrides. Takes precedence over `promptOverrideFile`. A system prompt replaces all Agent Host and SDK prompt sections and guardrails."
+                        ))
+                    },
+                    promptOverrideFile: {
+                        type: "string",
+                        description: ( localize(
+                            7400,
+                            "Path to a YAML file containing `systemPrompt` and/or `toolDescriptions` overrides. Ignored when `promptOverrideString` is configured."
+                        ))
+                    }
+                }
             },
-            deprecated: true,
-            markdownDeprecationMessage: ( localize(
-                6408,
-                "Use {0} instead",
-                `\`#${AgentNetworkDomainSettingId.DeniedNetworkDomains}#\``
-            ))
-        },
-        [ChatConfiguration.DefaultNewSessionMode]: {
-            type: "string",
-            description: ( localize(
-                6409,
-                "The default mode for new chat sessions. When empty, the chat view's default mode is used."
-            )),
-            default: ""
-        },
-        [AgentHostAhpJsonlLoggingSettingId]: {
-            type: "boolean",
-            description: ( localize(
-                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",
+            default: {},
+            scope: ConfigurationScope.APPLICATION,
             tags: ["experimental", "advanced"]
         },
-        [AgentHostCustomTerminalToolEnabledSettingId]: {
+        [AgentHostAllowSignedOutWhenUsableSettingId]: {
             type: "boolean",
-            description: ( localize(
-                6411,
-                "When enabled, Copilot SDK sessions use the Agent Host terminal tool override instead of the SDK's default terminal behavior."
+            markdownDescription: ( localize(
+                7401,
+                "When enabled, Agent Host sessions remain available while signed out. The Agents window opens without forcing GitHub sign-in, and editor chat lets you select the Copilot harness. Agents usable without GitHub (for example Codex with ChatGPT authentication or Claude in native mode with your own Anthropic credentials) work while signed out; agents that require GitHub prompt you to add a model or sign in. When disabled (the default), GitHub sign-in is required before the Agents window opens."
             )),
             default: false,
-            tags: ["experimental", "advanced"]
+            scope: ConfigurationScope.APPLICATION,
+            tags: ["experimental", "advanced"],
+            experiment: {
+                mode: "startup"
+            }
         },
-        [AgentHostOpus48PromptEnabledSettingId]: {
+        [ChatMicrosoftAuthenticationEnabledSettingId]: {
             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."
+            markdownDescription: ( localize(
+                7402,
+                "When enabled, sign-in dialogs offer \"Continue with Microsoft\". Signing in with Microsoft exchanges your Microsoft account for the GitHub access your organization has linked to it. The resulting GitHub sign-in lasts for the current window session only and is not saved."
             )),
             default: false,
-            tags: ["experimental", "advanced"]
+            scope: ConfigurationScope.APPLICATION,
+            tags: ["experimental", "advanced"],
+            experiment: {
+                mode: "startup"
+            }
         },
         [AgentHostSdkSandboxEnabledSettingId]: {
             type: "string",
-            enum: [
-                AgentSandboxEnabledValue.Off,
-                AgentSandboxEnabledValue.On,
-                AgentSandboxEnabledValue.AllowNetwork
-            ],
+            enum: [AgentSandboxEnabledValue.Off, AgentSandboxEnabledValue.On],
             enumDescriptions: [( localize(
-                6413,
+                7403,
                 "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."
+                7404,
+                "The SDK's built-in shell tool runs inside a sandbox using the configured filesystem policy with outbound network blocked."
+            ))],
+            markdownDescription: ( localize(
+                7405,
+                "Sandbox mode for the Copilot SDK's built-in shell tool on macOS and Linux. 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 to every permission mode. Unrestricted network is controlled by `#chat.agent.sandbox.allowNetwork#`. Use `#chat.agentHost.sdkSandbox.enabledWindows#` on Windows."
+            )),
+            default: AgentSandboxEnabledValue.Off,
+            tags: ["experimental", "advanced"],
+            experiment: {
+                mode: "auto"
+            }
+        },
+        [AgentHostSdkSandboxWindowsEnabledSettingId]: {
+            type: "string",
+            enum: [AgentSandboxEnabledValue.Off, AgentSandboxEnabledValue.On],
+            enumDescriptions: [( localize(
+                7406,
+                "No sandbox policy is forwarded for the SDK's built-in shell tool on Windows — commands run unsandboxed."
             )), ( localize(
-                6415,
-                "The SDK's built-in shell tool runs inside a sandbox with unrestricted outbound network access."
+                7407,
+                "The SDK's built-in shell tool runs inside the Windows sandbox using the configured filesystem policy."
             ))],
             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."
+                7408,
+                "Sandbox mode for the Copilot SDK's built-in shell tool on Windows. Only takes effect when `#chat.agentHost.customTerminalTool.enabled#` is `false`. This setting is independent of `#chat.agentHost.sdkSandbox.enabled#` so Windows sandbox support can be enabled separately. Unrestricted network is controlled by `#chat.agent.sandbox.allowNetwork#`."
             )),
             default: AgentSandboxEnabledValue.Off,
             tags: ["experimental", "advanced"],
@@ -1657,7 +2418,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.ToolConfirmationCarousel]: {
             type: "boolean",
             description: ( localize(
-                6417,
+                7409,
                 "When enabled, multiple tool confirmations are batched into a carousel above the input."
             )),
             default: true
@@ -1665,7 +2426,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.ToolRiskAssessmentEnabled]: {
             type: "boolean",
             description: ( localize(
-                6418,
+                7410,
                 "When enabled, tool confirmations show an LLM-generated risk level (Safe / Caution / Review carefully) and a short explanation."
             )),
             default: true,
@@ -1676,7 +2437,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.ToolRiskAssessmentModel]: {
             type: "string",
             description: ( localize(
-                6419,
+                7411,
                 "The language model id used to generate tool risk assessments. Should be a small, fast model."
             )),
             default: "copilot-utility-small",
@@ -1688,7 +2449,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.PlanAgentDefaultModel]: {
             type: "string",
             description: ( localize(
-                6420,
+                7412,
                 "Select the default language model to use for the Plan agent from the available providers."
             )),
             default: "",
@@ -1699,7 +2460,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.ExploreAgentDefaultModel]: {
             type: "string",
             description: ( localize(
-                6421,
+                7413,
                 "Select the default language model to use for the Explore subagent from the available providers."
             )),
             default: "",
@@ -1710,7 +2471,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.BYOKUtilityModelDefault]: {
             type: "string",
             markdownDescription: ( localize(
-                6422,
+                7414,
                 "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#`"
@@ -1720,14 +2481,14 @@ configurationRegistry.registerConfiguration({
                 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
+            enumItemLabels: [( localize(7415, "None")), ( localize(7416, "Main Agent Model")), ( localize(7417, "GitHub Copilot"))],
+            markdownEnumDescriptions: [( localize(7418, "Do not use a default utility model.")), ( localize(7419, "Use the selected BYOK main agent model.")), ( localize(7420, "Use the default GitHub Copilot utility models."))],
+            default: BYOKUtilityModelDefault.Copilot
         },
         [ChatConfiguration.UtilityModel]: {
             type: "string",
             description: ( localize(
-                6429,
+                7421,
                 "Override the language model used by built-in utility flows. Leave empty to use the configured default behavior."
             )),
             default: "",
@@ -1738,7 +2499,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.UtilitySmallModel]: {
             type: "string",
             description: ( localize(
-                6430,
+                7422,
                 "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: "",
@@ -1749,25 +2510,25 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.RequestQueueingDefaultAction]: {
             type: "string",
             enum: ["queue", "steer"],
-            enumDescriptions: [( localize(6431, "Queue the message to send after the current request completes.")), ( localize(
-                6432,
+            enumDescriptions: [( localize(7423, "Queue the message to send after the current request completes.")), ( localize(
+                7424,
                 "Steer the current request by sending the message immediately, signaling the current request to yield."
             ))],
             description: ( localize(
-                6433,
+                7425,
                 "Controls which action is the default for the queue button when a request is in progress."
             )),
             default: "steer"
         },
         [ChatConfiguration.EnableMath]: {
             type: "boolean",
-            description: ( localize(6434, "Enable math rendering in chat responses using KaTeX.")),
+            description: ( localize(7426, "Enable math rendering in chat responses using KaTeX.")),
             default: true
         },
         [ChatConfiguration.ShowCodeBlockProgressAnimation]: {
             type: "boolean",
             description: ( localize(
-                6435,
+                7427,
                 "When applying edits, show a progress animation in the code block pill. If disabled, shows the progress percentage instead."
             )),
             default: true,
@@ -1782,7 +2543,7 @@ configurationRegistry.registerConfiguration({
             additionalProperties: false,
             default: Object.fromEntries(( allDiscoverySources.map(k => [k, false]))),
             markdownDescription: ( localize(
-                6436,
+                7428,
                 "Configures discovery of Model Context Protocol servers from configuration from various other applications."
             ))
         },
@@ -1791,14 +2552,14 @@ configurationRegistry.registerConfiguration({
             default: false,
             tags: ["preview"],
             description: ( localize(
-                6437,
+                7429,
                 "Enables the default Marketplace for Model Context Protocol (MCP) servers."
             )),
             included: product.quality === "stable"
         },
         [mcpGalleryServiceUrlConfig]: {
             type: "string",
-            description: ( localize(6438, "Configure the MCP Gallery service URL to connect to")),
+            description: ( localize(7430, "Configure the MCP Gallery service URL to connect to")),
             default: "",
             scope: ConfigurationScope.APPLICATION,
             tags: ["usesOnlineServices", "advanced"],
@@ -1811,19 +2572,19 @@ configurationRegistry.registerConfiguration({
                 localization: {
                     description: {
                         key: "mcp.gallery.serviceUrl",
-                        value: ( localize(6438, "Configure the MCP Gallery service URL to connect to"))
+                        value: ( localize(7430, "Configure the MCP Gallery service URL to connect to"))
                     }
                 }
             }
         },
         [PromptsConfig.INSTRUCTIONS_LOCATION_KEY]: {
             type: "object",
-            title: ( localize(6439, "Instructions File Locations")),
+            title: ( localize(7431, "Instructions File Locations")),
             markdownDescription: ( localize(
-                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.",
+                7432,
+                "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.\n\nThis setting is only used by the Local agent harness.",
                 INSTRUCTION_FILE_EXTENSION,
-                INSTRUCTIONS_DOCUMENTATION_URL
+                getDocumentationUrl(PromptsType.instructions)
             )),
             default: {
                 ...( DEFAULT_INSTRUCTIONS_SOURCE_FOLDERS.map(folder => ({
@@ -1833,13 +2594,19 @@ configurationRegistry.registerConfiguration({
                     ...curr
                 }), {})
             },
+            markdownDeprecationMessage: ( localize(
+                7433,
+                "This setting and the Local agent harness will be removed in a future release. Use {0} in the Agent Customizations editor to move instructions into supported locations.",
+                migrateLocationSettingsLink
+            )),
+            deprecationMessageSeverity: "info",
             additionalProperties: {
                 type: "boolean"
             },
             propertyNames: {
                 pattern: VALID_PROMPT_FOLDER_PATTERN,
                 patternErrorMessage: ( localize(
-                    6441,
+                    7434,
                     "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."
                 ))
             },
@@ -1854,16 +2621,22 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.PROMPT_LOCATIONS_KEY]: {
             type: "object",
-            title: ( localize(6442, "Prompt File Locations")),
+            title: ( localize(7435, "Prompt File Locations")),
             markdownDescription: ( localize(
-                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.",
+                7436,
+                "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.\n\nThis setting is only used by the Local agent harness.",
                 PROMPT_FILE_EXTENSION,
-                PROMPT_DOCUMENTATION_URL
+                getDocumentationUrl(PromptsType.prompt)
             )),
             default: {
                 [PROMPT_DEFAULT_SOURCE_FOLDER]: true
             },
+            markdownDeprecationMessage: ( localize(
+                7437,
+                "This setting and the Local agent harness will be removed in a future release. Use {0} in the Agent Customizations editor to convert prompt files into skills.",
+                migratePromptFilesLink
+            )),
+            deprecationMessageSeverity: "info",
             additionalProperties: {
                 type: "boolean"
             },
@@ -1873,7 +2646,7 @@ configurationRegistry.registerConfiguration({
             propertyNames: {
                 pattern: VALID_PROMPT_FOLDER_PATTERN,
                 patternErrorMessage: ( localize(
-                    6444,
+                    7438,
                     "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."
                 ))
             },
@@ -1888,20 +2661,22 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.MODE_LOCATION_KEY]: {
             type: "object",
-            title: ( localize(6445, "Mode File Locations")),
+            title: ( localize(7439, "Mode File Locations")),
             markdownDescription: ( localize(
-                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.",
+                7440,
+                "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.\n\nThis setting is only used by the Local agent harness.",
                 LEGACY_MODE_FILE_EXTENSION,
-                AGENT_DOCUMENTATION_URL
+                getDocumentationUrl(PromptsType.agent)
             )),
             default: {
                 [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true
             },
-            deprecationMessage: ( localize(
-                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`"
+            markdownDeprecationMessage: ( localize(
+                7441,
+                "This setting and the Local agent harness will be removed in a future release. Chat modes are now called custom agents and are located in `.github/agents`. Use {0} in the Agent Customizations editor to move them into supported locations.",
+                migrateLocationSettingsLink
             )),
+            deprecationMessageSeverity: "info",
             additionalProperties: {
                 type: "boolean"
             },
@@ -1925,25 +2700,31 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.AGENTS_LOCATION_KEY]: {
             type: "object",
-            title: ( localize(6448, "Agent File Locations")),
+            title: ( localize(7442, "Agent File Locations")),
             markdownDescription: ( localize(
-                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.",
+                7443,
+                "Specify location(s) of custom agent files (`*{0}`). [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.\n\nThis setting is only used by the Local agent harness.",
                 AGENT_FILE_EXTENSION,
-                AGENT_DOCUMENTATION_URL
+                getDocumentationUrl(PromptsType.agent)
             )),
             default: {
                 [AGENTS_SOURCE_FOLDER]: true,
                 [CLAUDE_AGENTS_SOURCE_FOLDER]: true,
                 [COPILOT_USER_AGENTS_SOURCE_FOLDER]: true
             },
+            markdownDeprecationMessage: ( localize(
+                7444,
+                "This setting and the Local agent harness will be removed in a future release. Use {0} in the Agent Customizations editor to move agents into supported locations.",
+                migrateLocationSettingsLink
+            )),
+            deprecationMessageSeverity: "info",
             additionalProperties: {
                 type: "boolean"
             },
             propertyNames: {
                 pattern: VALID_PROMPT_FOLDER_PATTERN,
                 patternErrorMessage: ( localize(
-                    6450,
+                    7445,
                     "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported."
                 ))
             },
@@ -1960,10 +2741,10 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_AGENT_MD]: {
             type: "boolean",
-            title: ( localize(6451, "Use AGENTS.md file")),
+            title: ( localize(7446, "Use AGENTS.md file")),
             markdownDescription: ( localize(
-                6452,
-                "Controls whether instructions from `AGENTS.md` file found in a workspace roots are attached to all chat requests."
+                7447,
+                "Controls whether instructions from `AGENTS.md` file found in a workspace roots are attached to all chat requests. This setting is only used by the Local agent harness."
             )),
             default: true,
             restricted: true,
@@ -1972,10 +2753,10 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_NESTED_AGENT_MD]: {
             type: "boolean",
-            title: ( localize(6453, "Use nested AGENTS.md files")),
+            title: ( localize(7448, "Use nested AGENTS.md files")),
             markdownDescription: ( localize(
-                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."
+                7449,
+                "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. This setting is only used by the Local agent harness."
             )),
             default: false,
             restricted: true,
@@ -1990,10 +2771,10 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_CLAUDE_MD]: {
             type: "boolean",
-            title: ( localize(6455, "Use CLAUDE.md file")),
+            title: ( localize(7450, "Use CLAUDE.md file")),
             markdownDescription: ( localize(
-                6456,
-                "Controls whether instructions from `CLAUDE.md` file found in workspace roots, .claude and ~/.claude folder are attached to all chat requests."
+                7451,
+                "Controls whether instructions from `CLAUDE.md` file found in workspace roots, .claude and ~/.claude folder are attached to all chat requests. This setting is only used by the Local agent harness."
             )),
             default: true,
             restricted: true,
@@ -2002,10 +2783,10 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_AGENT_SKILLS]: {
             type: "boolean",
-            title: ( localize(6457, "Use Agent skills")),
+            title: ( localize(7452, "Use Agent skills")),
             markdownDescription: ( localize(
-                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)."
+                7453,
+                "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). This setting is only used by the Local agent harness."
             )),
             default: true,
             restricted: true,
@@ -2014,10 +2795,10 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_SKILL_ADHERENCE_PROMPT]: {
             type: "boolean",
-            title: ( localize(6459, "Use Skill Adherence Prompt")),
+            title: ( localize(7454, "Use Skill Adherence Prompt")),
             markdownDescription: ( localize(
-                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."
+                7455,
+                "Controls whether a stronger skill adherence prompt is used that encourages the model to immediately invoke skills when relevant rather than just announcing them. This setting is only used by the Local agent harness."
             )),
             default: false,
             restricted: true,
@@ -2035,10 +2816,10 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS]: {
             type: "boolean",
-            title: ( localize(6461, "Include Applying Instructions")),
+            title: ( localize(7456, "Include Applying Instructions")),
             markdownDescription: ( localize(
-                6462,
-                "Controls whether instructions with a matching 'applyTo' attribute are automatically included in chat requests."
+                7457,
+                "Controls whether instructions with a matching 'applyTo' attribute are automatically included in chat requests. This setting is only used by the Local agent harness."
             )),
             default: true,
             restricted: true,
@@ -2047,10 +2828,10 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.INCLUDE_REFERENCED_INSTRUCTIONS]: {
             type: "boolean",
-            title: ( localize(6463, "Include Referenced Instructions")),
+            title: ( localize(7458, "Include Referenced Instructions")),
             markdownDescription: ( localize(
-                6464,
-                "Controls whether referenced instructions are automatically included in chat requests."
+                7459,
+                "Controls whether referenced instructions are automatically included in chat requests. This setting is only used by the Local agent harness."
             )),
             default: false,
             restricted: true,
@@ -2059,10 +2840,10 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS]: {
             type: "boolean",
-            title: ( localize(6465, "Use Customizations in Parent Repositories")),
+            title: ( localize(7460, "Use Customizations in Parent Repositories")),
             markdownDescription: ( localize(
-                6466,
-                "Controls whether to use chat customization files in parent repositories."
+                7461,
+                "Controls whether to use chat customization files in parent repositories. This setting is only used by the Local agent harness."
             )),
             default: false,
             restricted: true,
@@ -2071,12 +2852,12 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.SKILLS_LOCATION_KEY]: {
             type: "object",
-            title: ( localize(6467, "Agent Skills Locations")),
+            title: ( localize(7462, "Agent Skills Locations")),
             markdownDescription: ( localize(
-                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.",
+                7463,
+                "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.\n\nThis setting is only used by the Local agent harness.",
                 SKILL_FILENAME,
-                SKILL_DOCUMENTATION_URL
+                getDocumentationUrl(PromptsType.skill)
             )),
             default: {
                 ...( DEFAULT_SKILL_SOURCE_FOLDERS.map(folder => ({
@@ -2086,13 +2867,19 @@ configurationRegistry.registerConfiguration({
                     ...curr
                 }), {})
             },
+            markdownDeprecationMessage: ( localize(
+                7464,
+                "This setting and the Local agent harness will be removed in a future release. Use {0} in the Agent Customizations editor to move skills into supported locations.",
+                migrateLocationSettingsLink
+            )),
+            deprecationMessageSeverity: "info",
             additionalProperties: {
                 type: "boolean"
             },
             propertyNames: {
                 pattern: VALID_PROMPT_FOLDER_PATTERN,
                 patternErrorMessage: ( localize(
-                    6469,
+                    7465,
                     "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported."
                 ))
             },
@@ -2109,11 +2896,11 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.HOOKS_LOCATION_KEY]: {
             type: "object",
-            title: ( localize(6470, "Hook File Locations")),
+            title: ( localize(7466, "Hook File Locations")),
             markdownDescription: ( localize(
-                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
+                7467,
+                "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`).\n\nThis setting is only used by the Local agent harness.",
+                getDocumentationUrl(PromptsType.hook)
             )),
             default: {
                 ...( DEFAULT_HOOK_FILE_PATHS.map(f => ({
@@ -2129,7 +2916,7 @@ configurationRegistry.registerConfiguration({
             propertyNames: {
                 pattern: VALID_PROMPT_FOLDER_PATTERN,
                 patternErrorMessage: ( localize(
-                    6472,
+                    7468,
                     "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported."
                 ))
             },
@@ -2151,10 +2938,10 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_CHAT_HOOKS]: {
             type: "boolean",
-            title: ( localize(6473, "Use Chat Hooks")),
+            title: ( localize(7469, "Use Chat Hooks")),
             markdownDescription: ( localize(
-                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#`."
+                7470,
+                "Controls whether chat hooks are executed at strategic points during an agent's workflow. Hooks are loaded from the files configured in `#chat.hookFilesLocations#`. This setting is only used by the Local agent harness."
             )),
             default: true,
             restricted: true,
@@ -2169,8 +2956,8 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.useHooks.description",
                         value: ( localize(
-                            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#`."
+                            7470,
+                            "Controls whether chat hooks are executed at strategic points during an agent's workflow. Hooks are loaded from the files configured in `#chat.hookFilesLocations#`. This setting is only used by the Local agent harness."
                         ))
                     }
                 }
@@ -2178,10 +2965,10 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_CLAUDE_HOOKS]: {
             type: "boolean",
-            title: ( localize(6475, "Use Claude Hooks")),
+            title: ( localize(7471, "Use Claude Hooks")),
             markdownDescription: ( localize(
-                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#`."
+                7472,
+                "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#`. This setting is only used by the Local agent harness."
             )),
             default: false,
             restricted: true,
@@ -2191,9 +2978,9 @@ configurationRegistry.registerConfiguration({
         [PromptsConfig.PROMPT_FILES_SUGGEST_KEY]: {
             type: "object",
             scope: ConfigurationScope.RESOURCE,
-            title: ( localize(6477, "Prompt File Recommendations")),
+            title: ( localize(7473, "Prompt File Recommendations")),
             markdownDescription: ( localize(
-                6478,
+                7474,
                 "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: {},
@@ -2215,7 +3002,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             description: ( localize(
-                6479,
+                7475,
                 "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."
             ))
         },
@@ -2223,21 +3010,24 @@ configurationRegistry.registerConfiguration({
             type: "string",
             default: "fixedScrolling",
             enum: ["collapsed", "collapsedPreview", "fixedScrolling"],
-            enumDescriptions: [( localize(6480, "Thinking parts will be collapsed by default.")), ( localize(
-                6481,
+            enumDescriptions: [( localize(7476, "Thinking parts will be collapsed by default.")), ( localize(
+                7477,
                 "Thinking parts will be expanded first, then collapse once we reach a part that is not thinking."
             )), ( localize(
-                6482,
+                7478,
                 "Show thinking in a fixed-height streaming panel that auto-scrolls; click header to expand to full height."
             ))],
-            description: ( localize(6483, "Controls how thinking is rendered.")),
+            description: ( localize(
+                7479,
+                "Controls how thinking is rendered. Read-only chats always use the collapsed preview style."
+            )),
             tags: ["experimental"]
         },
         [ChatConfiguration.ThinkingGenerateTitles]: {
             type: "boolean",
             default: true,
             description: ( localize(
-                6484,
+                7480,
                 "Controls whether to use an LLM to generate summary titles for thinking sections."
             )),
             tags: ["experimental"]
@@ -2246,12 +3036,12 @@ configurationRegistry.registerConfiguration({
             type: "string",
             default: "always",
             enum: ["off", "withThinking", "always"],
-            enumDescriptions: [( localize(6485, "Tool calls are shown separately, not collapsed into thinking.")), ( localize(
-                6486,
+            enumDescriptions: [( localize(7481, "Tool calls are shown separately, not collapsed into thinking.")), ( localize(
+                7482,
                 "Tool calls are collapsed into thinking sections when thinking is present."
-            )), ( localize(6487, "Tool calls are always collapsed, even without thinking."))],
+            )), ( localize(7483, "Tool calls are always collapsed, even without thinking."))],
             markdownDescription: ( localize(
-                6488,
+                7484,
                 "Controls how tool calls are displayed in relation to thinking sections."
             )),
             tags: ["experimental"]
@@ -2260,7 +3050,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             markdownDescription: ( localize(
-                6489,
+                7485,
                 "When enabled, terminal tool calls are displayed inside the thinking dropdown with a simplified view."
             )),
             tags: ["experimental"]
@@ -2269,7 +3059,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             markdownDescription: ( localize(
-                6490,
+                7486,
                 "When enabled, terminal tool calls are always displayed in a collapsible container with a simplified view."
             )),
             tags: ["experimental"]
@@ -2278,7 +3068,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: false,
             markdownDescription: ( localize(
-                6491,
+                7487,
                 "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"],
@@ -2298,7 +3088,7 @@ configurationRegistry.registerConfiguration({
                     enum: ["replace", "append"],
                     default: "append",
                     description: ( localize(
-                        6492,
+                        7488,
                         "'replace' replaces all default phrases entirely; 'append' adds your phrases to all default categories."
                     ))
                 },
@@ -2309,14 +3099,14 @@ configurationRegistry.registerConfiguration({
                     },
                     default: [],
                     description: ( localize(
-                        6493,
+                        7489,
                         "Custom loading messages to show during thinking, working progress, terminal, and tool operations."
                     ))
                 }
             },
             additionalProperties: false,
             markdownDescription: ( localize(
-                6494,
+                7490,
                 "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"]
@@ -2325,14 +3115,14 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             markdownDescription: ( localize(
-                6495,
-                "When enabled, tool failures are automatically expanded in the chat UI to show error details."
+                7491,
+                "When enabled, terminal tool failures are automatically expanded in the chat UI to show error details."
             ))
         },
-        [ChatConfiguration.AIDisabled]: {
+        [ChatAIDisabledSettingId]: {
             type: "boolean",
             description: ( localize(
-                6496,
+                7492,
                 "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."
             )),
             default: false,
@@ -2345,7 +3135,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.disableAIFeatures",
                         value: ( localize(
-                            6496,
+                            7492,
                             "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."
                         ))
                     }
@@ -2355,7 +3145,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.TitleBarSignInEnabled]: {
             type: "boolean",
             description: ( localize(
-                6497,
+                7493,
                 "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
@@ -2363,18 +3153,30 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.TitleBarOpenInAgentsWindowEnabled]: {
             type: "boolean",
             description: ( localize(
-                6498,
+                7494,
                 "Controls whether the Open in Agents Window button is shown in the title bar."
             )),
             default: true
         },
+        [ChatConfiguration.OpenInAgentsWindowRevealCurrentSession]: {
+            type: "boolean",
+            description: ( localize(
+                7495,
+                "Controls whether Open in Agents Window reveals the current local Agent Host session instead of opening a new session."
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
+        },
         "chat.approvedAccountOrganizations": {
             type: "array",
             items: {
                 type: "string"
             },
             description: ( localize(
-                6499,
+                7496,
                 "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: [],
@@ -2387,7 +3189,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "chat.approvedAccountOrganizations.policy.description",
                         value: ( localize(
-                            6500,
+                            7497,
                             "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)."
                         ))
                     }
@@ -2396,7 +3198,7 @@ configurationRegistry.registerConfiguration({
         },
         "chat.allowAnonymousAccess": {
             type: "boolean",
-            description: ( localize(6501, "Controls whether anonymous access is allowed in chat.")),
+            description: ( localize(7498, "Controls whether anonymous access is allowed in chat.")),
             default: false,
             included: false,
             tags: ["experimental"],
@@ -2407,7 +3209,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.GrowthNotificationEnabled]: {
             type: "boolean",
             description: ( localize(
-                6502,
+                7499,
                 "Controls whether to show a growth notification in the agent sessions view to encourage new users to try Copilot."
             )),
             default: false,
@@ -2419,7 +3221,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.RestoreLastPanelSession]: {
             type: "boolean",
             description: ( localize(
-                6503,
+                7500,
                 "Controls whether the last session is restored in panel after restart."
             )),
             default: false
@@ -2427,7 +3229,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.ExitAfterDelegation]: {
             type: "boolean",
             description: ( localize(
-                6504,
+                7501,
                 "Controls whether the chat panel automatically exits after delegating a request to another session."
             )),
             default: false,
@@ -2436,7 +3238,7 @@ configurationRegistry.registerConfiguration({
         "chat.extensionUnification.enabled": {
             type: "boolean",
             description: ( localize(
-                6505,
+                7502,
                 "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,
@@ -2445,34 +3247,74 @@ configurationRegistry.registerConfiguration({
                 mode: "auto"
             }
         },
-        [ChatConfiguration.GeneralPurposeAgentEnabled]: {
+        [ChatConfiguration.SubagentsAllowInvocationsFromSubagents]: {
             type: "boolean",
-            description: ( localize(
-                6506,
-                "Controls whether the built-in General Purpose agent is available as a subagent."
+            description: ( localize(7503, "Allow subagents to invoke subagents.")),
+            markdownDescription: ( localize(
+                7504,
+                "Controls whether subagents can invoke other subagents. When enabled, nesting is limited to a maximum depth of 5."
             )),
             default: false,
-            tags: ["experimental", "advanced"],
             experiment: {
                 mode: "auto"
             }
         },
-        [ChatConfiguration.SubagentsAllowInvocationsFromSubagents]: {
+        [ChatConfiguration.SubagentsDefaultToAuto]: {
             type: "boolean",
-            description: ( localize(6507, "Allow subagents to invoke subagents.")),
             markdownDescription: ( localize(
-                6508,
-                "Controls whether subagents can invoke other subagents. When enabled, nesting is limited to a maximum depth of 5."
+                7505,
+                "Controls whether local subagents use the Auto model when neither the tool call nor the selected agent specifies a model. Explicit tool and agent model selections take precedence. Subagents of a BYOK main model continue to use that model. Auto routing is not constrained by the main model's fixed cost tier."
             )),
             default: false,
+            tags: ["experimental"],
             experiment: {
                 mode: "auto"
             }
         },
+        [ChatConfiguration.SubagentsUseRichRendering]: {
+            type: "boolean",
+            description: ( localize(
+                7506,
+                "Controls whether subagents in chat editors use a rich presentation that opens each subagent in its own editor instead of rendering its full activity inline in the parent chat."
+            )),
+            default: true
+        },
+        [ChatConfiguration.SubagentsShowCreditUsage]: {
+            type: "boolean",
+            description: ( localize(
+                7507,
+                "Controls whether AI credit usage is shown next to the duration for subagents."
+            )),
+            default: false
+        },
+        [ChatConfiguration.TerminalAgentHostEnabled]: {
+            type: "boolean",
+            description: ( localize(
+                7508,
+                "Controls whether Terminal Chat is backed by the Agent Host instead of the extension host. Applied on startup."
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "startup"
+            }
+        },
+        [ChatConfiguration.InlineChatAgentHostEnabled]: {
+            type: "boolean",
+            description: ( localize(
+                7509,
+                "Controls whether editor inline chat is backed by the Agent Host instead of the extension host. Applied on startup."
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "startup"
+            }
+        },
         [ChatConfiguration.CollectInstructionsInExtension]: {
             type: "boolean",
             description: ( localize(
-                6509,
+                7510,
                 "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: false,
@@ -2482,32 +3324,130 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             tags: ["preview"],
             description: ( localize(
-                6510,
+                7511,
                 "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
+        },
+        [ChatConfiguration.ChatCustomizationsPromptMigrationEnabled]: {
+            type: "boolean",
+            tags: ["experimental"],
+            description: ( localize(
+                7512,
+                "Controls whether the Chat Customizations editor offers to convert prompt files into skills for agent-host harnesses, which ignore prompt files. When disabled, the migration card and sidebar shortcut are hidden."
+            )),
+            default: true
+        },
+        [ChatConfiguration.ChatCustomizationsUserDataMigrationEnabled]: {
+            type: "boolean",
+            tags: ["experimental"],
+            description: ( localize(
+                7513,
+                "Controls whether the Chat Customizations editor offers to move agents and instructions stored in user data to the active agent-host harness, which ignores the user data location. When disabled, the migration card and sidebar shortcut are hidden."
+            )),
+            default: false
+        },
+        [ChatConfiguration.ChatCustomizationsLocationsMigrationEnabled]: {
+            type: "boolean",
+            tags: ["experimental"],
+            description: ( localize(
+                7514,
+                "Controls whether the Chat Customizations editor offers to move agents, instructions, and skills from configured locations that are not supported by the active agent-host harness. When disabled, the migration card and sidebar shortcut are hidden."
+            )),
+            default: false
+        },
+        [ChatConfiguration.ChatCustomizationsMcpServerMigrationEnabled]: {
+            type: "boolean",
+            tags: ["experimental"],
+            description: ( localize(
+                7515,
+                "Controls whether the Chat Customizations editor offers to move supported workspace MCP servers out of .vscode/mcp.json and into a .mcp.json file at the workspace root, where the active agent-host harness discovers them directly. When disabled, the migration card and sidebar shortcut are hidden."
+            )),
+            default: false
+        },
+        [ChatConfiguration.ChatCustomizationsMigrationHint]: {
+            type: "string",
+            enum: [
+                CustomizationMigrationHintMode.Never,
+                CustomizationMigrationHintMode.Once,
+                CustomizationMigrationHintMode.Always
+            ],
+            enumDescriptions: [( localize(7516, "Never show customization migration hints in chat.")), ( localize(7517, "Show a customization migration hint once per chat session.")), ( localize(7518, "Show a customization migration hint for every chat request."))],
+            description: ( localize(
+                7519,
+                "Controls whether chat shows information about customizations that are not used by the active Agent Host harness."
+            )),
+            default: CustomizationMigrationHintMode.Never,
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
         }
     }
 });
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(6511, "Chat"))),
+    EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(7520, "Chat"))),
     [( new SyncDescriptor(ChatEditorInput))]
 );
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(ChatDebugEditor, ChatDebugEditorInput.ID, ( localize(6512, "Debug View"))),
+    EditorPaneDescriptor.create(ChatDebugEditor, ChatDebugEditorInput.ID, ( localize(7521, "Debug View"))),
     [( new SyncDescriptor(ChatDebugEditorInput))]
 );
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(AgentPluginEditor, AgentPluginEditor.ID, ( localize(6513, "Agent Plugin"))),
+    EditorPaneDescriptor.create(AgentPluginEditor, AgentPluginEditor.ID, ( localize(7522, "Agent Plugin"))),
     [( new SyncDescriptor(AgentPluginEditorInput))]
 );
+function isStringKeyedObject(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function migrateChatDefaultConfiguration(value) {
+    if (!isStringKeyedObject(value)) {
+        return undefined;
+    }
+    let approvals;
+    switch (value.approvals) {
+    case ChatPermissionLevel.Default:
+        approvals = ChatDefaultPermissionLevel.Manual;
+        break;
+    case ChatPermissionLevel.AutoApprove:
+        approvals = ChatDefaultPermissionLevel.AllowAll;
+        break;
+    default:
+        return undefined;
+    }
+    return {
+        ...value,
+        approvals
+    };
+}
+function migrateAgentMergeMergePullRequest(value) {
+    return typeof value === "boolean" ? (value ? "always" : "never") : value;
+}
 ( Registry.as(Extensions$2.ConfigurationMigration)).registerConfigurationMigrations([{
     key: "chat.agentSessions.defaultConfiguration",
     migrateFn: (value, _accessor) => ([["chat.agentSessions.defaultConfiguration", {
         value: undefined
     }], [ChatConfiguration.DefaultConfiguration, {
-        value
+        value: migrateChatDefaultConfiguration(value) ?? value
     }]])
+}, {
+    key: ChatConfiguration.DefaultConfiguration,
+    migrateFn: value => ({
+        value: migrateChatDefaultConfiguration(value) ?? value
+    })
+}, {
+    key: "chat.experimental.autoApprovals.enabled",
+    migrateFn: (value, accessor) => {
+        const pairs = [["chat.experimental.autoApprovals.enabled", {
+            value: undefined
+        }]];
+        if (accessor(ChatConfiguration.AssistedPermissionsEnabled) === undefined) {
+            pairs.push([ChatConfiguration.AssistedPermissionsEnabled, {
+                value
+            }]);
+        }
+        return pairs;
+    }
 }, {
     key: "chat.experimental.detectParticipant.enabled",
     migrateFn: (value, _accessor) => ([["chat.experimental.detectParticipant.enabled", {
@@ -2547,6 +3487,11 @@ configurationRegistry.registerConfiguration({
             value
         };
     }
+}, {
+    key: ChatConfiguration.ShowExternalAgentSessions,
+    migrateFn: value => ({
+        value: value === "all" ? ChatExternalSessionsMode.Last30Days : value
+    })
 }, {
     key: ChatConfiguration.NotifyWindowOnConfirmation,
     migrateFn: value => {
@@ -2582,62 +3527,77 @@ configurationRegistry.registerConfiguration({
     }], [ChatConfiguration.PluginLocations, {
         value
     }]])
-}, {
-    key: AgentNetworkDomainSettingId.DeprecatedSandboxAllowedNetworkDomains,
-    migrateFn: (value, accessor) => {
-        const pairs = [];
-        pairs.push([AgentNetworkDomainSettingId.DeprecatedSandboxAllowedNetworkDomains, {
-            value: undefined
-        }]);
-        if (value !== undefined && accessor(AgentNetworkDomainSettingId.AllowedNetworkDomains) === undefined) {
-            pairs.push([AgentNetworkDomainSettingId.AllowedNetworkDomains, {
-                value
-            }]);
+},
+...( ( Object.values(AgentMergeSettingId)).map(settingId => {
+    const legacyKey = settingId.replace(/^chat\./, "chat.agentHost.");
+    return {
+        key: legacyKey,
+        migrateFn: (value, accessor) => {
+            const pairs = [[legacyKey, {
+                value: undefined
+            }]];
+            if (accessor(settingId) === undefined) {
+                pairs.push([settingId, {
+                    value: settingId === AgentMergeSettingId.MergePullRequest ? migrateAgentMergeMergePullRequest(value) : value
+                }]);
+            }
+            return pairs;
         }
-        return pairs;
-    }
-}, {
-    key: AgentNetworkDomainSettingId.DeprecatedSandboxDeniedNetworkDomains,
-    migrateFn: (value, accessor) => {
-        const pairs = [];
-        pairs.push([AgentNetworkDomainSettingId.DeprecatedSandboxDeniedNetworkDomains, {
-            value: undefined
-        }]);
-        if (value !== undefined && accessor(AgentNetworkDomainSettingId.DeniedNetworkDomains) === undefined) {
-            pairs.push([AgentNetworkDomainSettingId.DeniedNetworkDomains, {
-                value
-            }]);
+    };
+})), {
+    key: AgentMergeSettingId.MergePullRequest,
+    migrateFn: value => {
+        if (typeof value !== "boolean") {
+            return [];
         }
-        return pairs;
+        return [[AgentMergeSettingId.MergePullRequest, {
+            value: migrateAgentMergeMergePullRequest(value)
+        }]];
     }
 }, {
-    key: AgentNetworkDomainSettingId.DeprecatedOldAllowedNetworkDomains,
+    key: "chat.speechToText.model",
     migrateFn: (value, accessor) => {
-        const pairs = [];
-        pairs.push([AgentNetworkDomainSettingId.DeprecatedOldAllowedNetworkDomains, {
+        const legacyModelIds = [
+            "onnx-community/whisper-tiny",
+            "onnx-community/whisper-base",
+            "onnx-community/whisper-small",
+            "onnx-community/nemotron-3.5-asr-streaming-0.6b-onnx-int4",
+            "nemotron-speech-streaming-en-0.6b"
+        ];
+        const migrated = (typeof value === "string" && legacyModelIds.includes(value)) ? DEFAULT_LOCAL_TRANSCRIPTION_MODEL : value;
+        const pairs = [["chat.speechToText.model", {
             value: undefined
-        }]);
-        if (value !== undefined && accessor(AgentNetworkDomainSettingId.AllowedNetworkDomains) === undefined) {
-            pairs.push([AgentNetworkDomainSettingId.AllowedNetworkDomains, {
-                value
+        }]];
+        if (accessor("dictation.model") === undefined) {
+            pairs.push(["dictation.model", {
+                value: migrated
             }]);
         }
         return pairs;
     }
 }, {
-    key: AgentNetworkDomainSettingId.DeprecatedOldDeniedNetworkDomains,
+    key: "dictation.model",
+    migrateFn: value => ({
+        value: value === "nemotron-speech-streaming-en-0.6b" ? DEFAULT_LOCAL_TRANSCRIPTION_MODEL : value
+    })
+}, {
+    key: "chat.speechToText.enabled",
     migrateFn: (value, accessor) => {
-        const pairs = [];
-        pairs.push([AgentNetworkDomainSettingId.DeprecatedOldDeniedNetworkDomains, {
+        const pairs = [["chat.speechToText.enabled", {
             value: undefined
-        }]);
-        if (value !== undefined && accessor(AgentNetworkDomainSettingId.DeniedNetworkDomains) === undefined) {
-            pairs.push([AgentNetworkDomainSettingId.DeniedNetworkDomains, {
+        }]];
+        if (accessor("dictation.enabled") === undefined) {
+            pairs.push(["dictation.enabled", {
                 value
             }]);
         }
         return pairs;
     }
+}, {
+    key: "chat.speechToText.mode",
+    migrateFn: () => ([["chat.speechToText.mode", {
+        value: undefined
+    }]])
 }]);
 let ChatResolverContribution = class ChatResolverContribution extends Disposable {
     static {
@@ -2665,7 +3625,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
     _registerEditor(scheme) {
         this._editorRegistrations.set(scheme, this.editorResolverService.registerEditor(`${scheme}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localize(6511, "Chat")),
+            label: ( localize(7520, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
@@ -2717,7 +3677,7 @@ let ChatDebugResolverContribution = class ChatDebugResolverContribution {
     constructor(editorResolverService) {
         editorResolverService.registerEditor(`${ChatDebugEditorInput.RESOURCE.scheme}:**/**`, {
             id: ChatDebugEditorInput.ID,
-            label: ( localize(6512, "Debug View")),
+            label: ( localize(7521, "Debug View")),
             priority: RegisteredEditorPriority.exclusive
         }, {
             singlePerResource: true,
@@ -2756,13 +3716,13 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Di
             this.experimentService.getTreatment(treatmentId).then(value => {
                 const node = {
                     id: "chatSidebar",
-                    title: ( localize(6246, "Chat")),
+                    title: ( localize(7167, "Chat")),
                     type: "object",
                     properties: {
                         "chat.agent.maxRequests": {
                             type: "number",
                             markdownDescription: ( localize(
-                                6514,
+                                7523,
                                 "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,
@@ -2799,13 +3759,13 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Di
         this.experimentService.getTreatment("chatDefaultNewSessionMode").then(value => {
             const node = {
                 id: "chatSidebar",
-                title: ( localize(6246, "Chat")),
+                title: ( localize(7167, "Chat")),
                 type: "object",
                 properties: {
                     [ChatConfiguration.DefaultNewSessionMode]: {
                         type: "string",
                         description: ( localize(
-                            6409,
+                            7372,
                             "The default mode for new chat sessions. When empty, the chat view's default mode is used."
                         )),
                         default: typeof value === "string" ? value : ""
@@ -2824,17 +3784,16 @@ let ChatForegroundSessionCountContribution = class ChatForegroundSessionCountCon
     static {
         this.ID = "workbench.contrib.chatForegroundSessionCount";
     }
-    constructor(contextKeyService, chatWidgetService, viewsService, editorService) {
+    constructor(contextKeyService, chatWidgetService, viewsService) {
         super();
         this.contextKeyService = contextKeyService;
         this.chatWidgetService = chatWidgetService;
         this.viewsService = viewsService;
-        this.editorService = editorService;
         this.foregroundSessionCountContextKey = ChatContextKeys.foregroundSessionCount.bindTo(this.contextKeyService);
         this._register(this.chatWidgetService.onDidAddWidget(() => {
             this.updateForegroundSessionCount();
         }));
-        this._register(this.editorService.onDidVisibleEditorsChange(() => {
+        this._register(this.chatWidgetService.onDidChangeWidgetVisibility(() => {
             this.updateForegroundSessionCount();
         }));
         this._register(
@@ -2847,7 +3806,7 @@ let ChatForegroundSessionCountContribution = class ChatForegroundSessionCountCon
     updateForegroundSessionCount() {
         let count = this.viewsService.isViewVisible(ChatViewId) ? 1 : 0;
         for (const widget of this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat)) {
-            if (widget.domNode.offsetParent === null) {
+            if (!widget.visible) {
                 continue;
             }
             if (isIChatViewViewContext(widget.viewContext)) {
@@ -2861,7 +3820,7 @@ let ChatForegroundSessionCountContribution = class ChatForegroundSessionCountCon
         this.foregroundSessionCountContextKey.set(count);
     }
 };
-ChatForegroundSessionCountContribution = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, IChatWidgetService)), ( __param(2, IViewsService)), ( __param(3, IEditorService))], ChatForegroundSessionCountContribution));
+ChatForegroundSessionCountContribution = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, IChatWidgetService)), ( __param(2, IViewsService))], ChatForegroundSessionCountContribution));
 function getCustomModesWithUniqueNames(builtinModes, customModes) {
     const customModeIds = ( new Set());
     const builtinNames = ( new Set(( builtinModes.map(mode => mode.name.get()))));
@@ -2981,7 +3940,7 @@ let ToolReferenceNamesContribution = class ToolReferenceNamesContribution extend
         for (const tool of tools) {
             toolReferenceNameEnumValues.push(tool.toolReferenceName);
             toolReferenceNameEnumDescriptions.push(( localize(
-                6515,
+                7524,
                 "{0} - {1}",
                 tool.toolReferenceName,
                 tool.userDescription || tool.displayName
@@ -2996,12 +3955,33 @@ let ToolReferenceNamesContribution = class ToolReferenceNamesContribution extend
     }
 };
 ToolReferenceNamesContribution = ( __decorate([( __param(0, ILanguageModelToolsService))], ToolReferenceNamesContribution));
+let ChatSpeechToTextInitContribution = class ChatSpeechToTextInitContribution {
+    static {
+        this.ID = "workbench.contrib.chatSpeechToTextInit";
+    }
+    constructor(_chatSpeechToTextService) {}
+};
+ChatSpeechToTextInitContribution = ( __decorate([( __param(0, IChatSpeechToTextService))], ChatSpeechToTextInitContribution));
+let CustomizationMigrationHintContribution = class CustomizationMigrationHintContribution extends Disposable {
+    static {
+        this.ID = "workbench.contrib.customizationMigrationHint";
+    }
+    constructor(chatService, customizationMigrationService) {
+        super();
+        this._register(chatService.registerCustomizationMigrationHintProvider(
+            (sessionResource, token) => customizationMigrationService.computeMigrationHint(sessionResource, token)
+        ));
+    }
+};
+CustomizationMigrationHintContribution = ( __decorate([( __param(0, IChatService)), ( __param(1, ICustomizationMigrationService))], CustomizationMigrationHintContribution));
 AccessibleViewRegistry.register(( new ChatTerminalOutputAccessibleView()));
 AccessibleViewRegistry.register(( new ChatResponseAccessibleView()));
 AccessibleViewRegistry.register(( new PanelChatAccessibilityHelp()));
 AccessibleViewRegistry.register(( new QuickChatAccessibilityHelp()));
 AccessibleViewRegistry.register(( new EditsChatAccessibilityHelp()));
 AccessibleViewRegistry.register(( new AgentChatAccessibilityHelp()));
+AccessibleViewRegistry.register(( new ChatFindAccessibilityHelp()));
+AccessibleViewRegistry.register(( new ChatPetAchievementsAccessibilityHelp()));
 registerEditorFeature(ChatInputBoxContentProvider);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ChatDebugEditorInput.ID, ChatDebugEditorInputSerializer);
@@ -3010,6 +3990,16 @@ registerWorkbenchContribution2(
     CopilotTelemetryContribution,
     WorkbenchPhase.BlockRestore
 );
+registerWorkbenchContribution2(
+    ChatSpeechToTextInitContribution.ID,
+    ChatSpeechToTextInitContribution,
+    WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(
+    CustomizationMigrationHintContribution.ID,
+    CustomizationMigrationHintContribution,
+    WorkbenchPhase.AfterRestored
+);
 registerWorkbenchContribution2(
     ChatResolverContribution.ID,
     ChatResolverContribution,
@@ -3045,6 +4035,7 @@ registerWorkbenchContribution2(
     ChatSessionOptionSlashCommandsContribution,
     WorkbenchPhase.Eventually
 );
+registerWorkbenchContribution2(ChatOutlineCreator.ID, ChatOutlineCreator, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(
     ChatExtensionPointHandler.ID,
     ChatExtensionPointHandler,
@@ -3053,7 +4044,7 @@ registerWorkbenchContribution2(
 registerWorkbenchContribution2(
     LanguageModelToolsExtensionPointHandler.ID,
     LanguageModelToolsExtensionPointHandler,
-    WorkbenchPhase.BlockRestore
+    WorkbenchPhase.BlockStartup
 );
 registerWorkbenchContribution2(
     ChatPromptFilesExtensionPointHandler.ID,
@@ -3075,6 +4066,16 @@ registerWorkbenchContribution2(
     ChatCopyActionRendering,
     WorkbenchPhase.BlockRestore
 );
+registerWorkbenchContribution2(
+    ChatModelFeedbackSurveyActionRendering.ID,
+    ChatModelFeedbackSurveyActionRendering,
+    WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(
+    ChatModelFeedbackSurveyPromptContribution.ID,
+    ChatModelFeedbackSurveyPromptContribution,
+    WorkbenchPhase.Eventually
+);
 registerWorkbenchContribution2(
     ChatImplicitContextContribution.ID,
     ChatImplicitContextContribution,
@@ -3101,8 +4102,13 @@ registerWorkbenchContribution2(
     WorkbenchPhase.AfterRestored
 );
 registerWorkbenchContribution2(
-    LocalAgentDisabledInputTipContribution.ID,
-    LocalAgentDisabledInputTipContribution,
+    ChatPromoNotificationContribution.ID,
+    ChatPromoNotificationContribution,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    ChatExpNotificationContribution.ID,
+    ChatExpNotificationContribution,
     WorkbenchPhase.AfterRestored
 );
 registerWorkbenchContribution2(
@@ -3229,10 +4235,41 @@ registerWorkbenchContribution2(
     AgentPluginRecommendations,
     WorkbenchPhase.Eventually
 );
+registerWorkbenchContribution2(
+    AgentPluginCommandsContribution.ID,
+    AgentPluginCommandsContribution,
+    WorkbenchPhase.AfterRestored
+);
 registerWorkbenchContribution2(PluginAutoUpdate.ID, PluginAutoUpdate, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(
+    ChatReferenceAttachmentWidgetContribution.ID,
+    ChatReferenceAttachmentWidgetContribution,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    TranscriptContextAttachmentWidgetContribution.ID,
+    TranscriptContextAttachmentWidgetContribution,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    ChatPetContextContribution.ID,
+    ChatPetContextContribution,
+    WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(
+    ChatPetCustomizationAchievementContribution.ID,
+    ChatPetCustomizationAchievementContribution,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    ChatPetEditingAchievementContribution.ID,
+    ChatPetEditingAchievementContribution,
+    WorkbenchPhase.AfterRestored
+);
 registerChatActions();
 registerChatAccessibilityActions();
 registerChatCopyActions();
+registerChatModelFeedbackSurveyActions();
 registerChatOpenAgentDebugPanelAction();
 registerChatCodeBlockActions();
 registerChatCodeCompareBlockActions();
@@ -3240,6 +4277,12 @@ registerChatFileTreeActions();
 registerChatPromptNavigationActions();
 registerChatTitleActions();
 registerChatExecuteActions();
+registerChatFindActions();
+registerAction2(ChatVoiceInputModeAction);
+registerAction2(ChatVoiceInputModeToggleListenAction);
+registerVoiceInputModeSimulateActions();
+registerChatSpeechToTextActions();
+registerConfigureSpeechInstructionsActions();
 registerChatQueueActions();
 registerQuickChatActions();
 registerChatExportActions();
@@ -3252,7 +4295,6 @@ registerChatElicitationActions();
 registerChatToolActions();
 registerLanguageModelActions();
 registerChatPluginActions();
-registerPlanReviewFeedbackEditorActions();
 registerAction2(ConfigureToolSets);
 registerEditorFeature(ChatPasteProvidersFeature);
 agentPluginDiscoveryRegistry.register(( new SyncDescriptor(ConfiguredAgentPluginDiscovery)), AgentPluginDiscoveryPriority.Configured);