@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -3,11 +3,10 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { isMarkdownString, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
+import { PolicyCategory } from '@codingame/monaco-vscode-api/vscode/vs/base/common/policy';
 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';
@@ -18,70 +17,74 @@ import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { mcpGalleryServiceUrlConfig, mcpGalleryServiceEnablementConfig, mcpAutoStartConfig, McpAutoStartValue, mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
+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 { EditorPaneDescriptor } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/editor';
 import { Extensions as Extensions$1 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/configuration';
 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 { 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 { AssistedTypes, AddConfigurationType } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration';
 import { mcpDiscoverySection, allDiscoverySources, discoverySourceSettingsLabel, mcpServerSamplingSection } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
-import '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/chatColors';
-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 '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes';
+import '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/common/chatColors';
+import '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { ChatResponseResourceFileSystemProvider } from '../common/chatResponseResourceFileSystemProvider.js';
 import '../common/chatServiceImpl.js';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import '../common/chatSlashCommands.js';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 import '../common/chatTodoListService.js';
 import '../common/chatTransferService.js';
-import '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService';
+import '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService';
 import { ChatConfiguration, ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
-import '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/languageModelStats';
-import { PromptsConfig } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
-import { MODE_DEFAULT_SOURCE_FOLDER, MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/languageModelStats';
+import { ChatPromptFilesExtensionPointHandler } from '../common/promptSyntax/chatPromptFilesContribution.js';
+import { PromptsConfig } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
+import { LEGACY_MODE_DEFAULT_SOURCE_FOLDER, LEGACY_MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { PromptLanguageFeaturesProvider } from '../common/promptSyntax/promptFileContributions.js';
-import { MODE_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { AGENT_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import '../common/promptSyntax/service/promptsServiceImpl.js';
 import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
-import { ChatPromptFilesExtensionPointHandler } from '../common/promptSyntax/chatPromptFilesContribution.js';
 import { BuiltinToolsContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/tools';
 import '../common/voiceChatService.js';
 import { registerChatAccessibilityActions } from './actions/chatAccessibilityActions.js';
 import { PanelChatAccessibilityHelp, QuickChatAccessibilityHelp, EditsChatAccessibilityHelp, AgentChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
-import { ACTION_ID_NEW_CHAT, CopilotTitleBarMenuRendering, registerChatActions } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { registerNewChatActions } from './actions/chatClearActions.js';
+import { ACTION_ID_NEW_CHAT, CopilotTitleBarMenuRendering, registerChatActions } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { CodeBlockActionRendering, registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from './actions/chatCodeblockActions.js';
-import { ChatContextContributions } from './actions/chatContext.js';
+import { ChatContextContributions } from '@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/workbench/contrib/chat/browser/actions/chatContext';
 import { registerChatContextActions } from './actions/chatContextActions.js';
 import { registerChatCopyActions } from './actions/chatCopyActions.js';
 import { registerChatDeveloperActions } from './actions/chatDeveloperActions.js';
-import { ChatSubmitAction, registerChatExecuteActions } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
+import { ChatSubmitAction, registerChatExecuteActions } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { registerChatFileTreeActions } from './actions/chatFileTreeActions.js';
 import { ChatGettingStartedContribution } from './actions/chatGettingStarted.js';
-import { registerChatPromptNavigationActions } from './actions/chatPromptNavigationActions.js';
 import { registerChatExportActions } from './actions/chatImportExport.js';
 import { registerLanguageModelActions } from './actions/chatLanguageModelActions.js';
 import { registerMoveActions } from './actions/chatMoveActions.js';
+import { registerNewChatActions } from './actions/chatNewActions.js';
+import { registerChatPromptNavigationActions } from './actions/chatPromptNavigationActions.js';
 import { registerQuickChatActions } from './actions/chatQuickInputActions.js';
-import { RenameChatSessionAction, DeleteChatSessionAction, OpenChatSessionInNewWindowAction, OpenChatSessionInNewEditorGroupAction, OpenChatSessionInSidebarAction, ToggleChatSessionsDescriptionDisplayAction, ChatSessionsGettingStartedAction } from './actions/chatSessionActions.js';
-import { registerChatTitleActions } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
+import { RenameChatSessionAction, DeleteChatSessionAction, OpenChatSessionInNewWindowAction, OpenChatSessionInNewEditorGroupAction, OpenChatSessionInSidebarAction, ToggleChatSessionsDescriptionDisplayAction, ChatSessionsGettingStartedAction, ToggleAgentSessionsViewLocationAction } from './actions/chatSessionActions.js';
+import { registerChatTitleActions } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
 import { registerChatToolActions } from './actions/chatToolActions.js';
 import { ChatTransferContribution } from './actions/chatTransfer.js';
+import './agentSessions/agentSessionsView.js';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import './chatAccessibilityService.js';
-import '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatAttachmentModel';
+import '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatAttachmentModel';
 import './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/observableInternal/index';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { ChatInputBoxContentProvider } from './chatEdinputInputContentProvider.js';
 import { ChatEditingEditorAccessibility } from './chatEditing/chatEditingEditorAccessibility.js';
 import { registerChatEditorActions } from './chatEditing/chatEditingEditorActions.js';
@@ -91,76 +94,78 @@ import './chatEditing/chatEditingServiceImpl.js';
 import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
 import { SimpleBrowserOverlay } from './chatEditing/simpleBrowserEditorOverlay.js';
 import { ChatEditor } from './chatEditor.js';
-import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import './chatLayoutService.js';
-import { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
+import './chatManagement/chatManagement.contribution.js';
+import { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
 import './chatOutputItemRenderer.js';
 import { ChatExtensionPointHandler, ChatCompatibilityNotifier } from './chatParticipant.contribution.js';
-import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
+import { ChatPasteProvidersFeature } from '@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/workbench/contrib/chat/browser/chatPasteProviders';
 import './chatQuick.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
+import { LocalChatSessionsProvider } from './chatSessions/localChatSessionsProvider.js';
+import { ChatSessionsViewContrib, ChatSessionsView } from './chatSessions/view/chatSessionsView.js';
 import { ChatSetupContribution, ChatTeardownContribution } from './chatSetup.js';
 import { ChatStatusBarEntry } from './chatStatus.js';
 import './chatVariables.js';
-import { ChatWidget } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { ChatImplicitContextContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext';
+import { ChatWidget } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { ChatImplicitContextContribution } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext';
 import '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions';
 import './contrib/chatInputEditorContrib.js';
 import './contrib/chatInputEditorHover.js';
-import { ChatRelatedFilesContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib';
+import { ChatRelatedFilesContribution } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib';
+import './languageModelToolsConfirmationService.js';
 import { globalAutoApproveDescription } from './languageModelToolsService.js';
 import './promptSyntax/promptCodingAgentActionContribution.js';
 import './promptSyntax/promptToolsCodeLensProvider.js';
 import { PromptUrlHandler } from './promptSyntax/promptUrlHandler.js';
-import { SAVE_TO_PROMPT_SLASH_COMMAND_NAME, SAVE_TO_PROMPT_ACTION_ID } from './promptSyntax/saveToPromptAction.js';
 import { UserToolSetsContributions, ConfigureToolSets } from './tools/toolSetsContribution.js';
 import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
-import { ChatSessionsView } from './chatSessions/view/chatSessionsView.js';
 
 const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'chatSidebar',
-    title: ( localize(4782, "Chat")),
+    title: ( localize(4831, "Chat")),
     type: 'object',
     properties: {
         'chat.fontSize': {
             type: 'number',
-            description: ( localize(4783, "Controls the font size in pixels in chat messages.")),
+            description: ( localize(4832, "Controls the font size in pixels in chat messages.")),
             default: 13,
             minimum: 6,
             maximum: 100
         },
         'chat.fontFamily': {
             type: 'string',
-            description: ( localize(4784, "Controls the font family in chat messages.")),
+            description: ( localize(4833, "Controls the font family in chat messages.")),
             default: 'default'
         },
         'chat.editor.fontSize': {
             type: 'number',
-            description: ( localize(4785, "Controls the font size in pixels in chat codeblocks.")),
+            description: ( localize(4834, "Controls the font size in pixels in chat codeblocks.")),
             default: isMacintosh ? 12 : 14,
         },
         'chat.editor.fontFamily': {
             type: 'string',
-            description: ( localize(4786, "Controls the font family in chat codeblocks.")),
+            description: ( localize(4835, "Controls the font family in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.fontWeight': {
             type: 'string',
-            description: ( localize(4787, "Controls the font weight in chat codeblocks.")),
+            description: ( localize(4836, "Controls the font weight in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.wordWrap': {
             type: 'string',
-            description: ( localize(4788, "Controls whether lines should wrap in chat codeblocks.")),
+            description: ( localize(4837, "Controls whether lines should wrap in chat codeblocks.")),
             default: 'off',
             enum: ['on', 'off']
         },
         'chat.editor.lineHeight': {
             type: 'number',
             description: ( localize(
-                4789,
+                4838,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
@@ -168,7 +173,7 @@ configurationRegistry.registerConfiguration({
         'chat.commandCenter.enabled': {
             type: 'boolean',
             markdownDescription: ( localize(
-                4790,
+                4839,
                 "Controls whether the command center shows a menu for actions to control chat (requires {0}).",
                 '`#window.commandCenter#`'
             )),
@@ -178,17 +183,17 @@ configurationRegistry.registerConfiguration({
             type: 'object',
             tags: ['experimental'],
             description: ( localize(
-                4791,
+                4840,
                 "Enables automatically using the active editor as chat context for specified chat locations."
             )),
             additionalProperties: {
                 type: 'string',
                 enum: ['never', 'first', 'always'],
-                description: ( localize(4792, "The value for the implicit context.")),
+                description: ( localize(4841, "The value for the implicit context.")),
                 enumDescriptions: [
-                    ( localize(4793, "Implicit context is never enabled.")),
-                    ( localize(4794, "Implicit context is enabled for the first interaction.")),
-                    ( localize(4795, "Implicit context is always enabled."))
+                    ( localize(4842, "Implicit context is never enabled.")),
+                    ( localize(4843, "Implicit context is enabled for the first interaction.")),
+                    ( localize(4844, "Implicit context is always enabled."))
                 ]
             },
             default: {
@@ -199,15 +204,15 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             tags: ['experimental'],
             markdownDescription: ( localize(
-                4796,
-                "Controls whether the new implicit context flow is shown. In Ask and Edit modes, the context will automatically be included. In Agent mode context will be suggested as an attachment. Selections are always included as context."
+                4845,
+                "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,
         },
         'chat.editing.autoAcceptDelay': {
             type: 'number',
             markdownDescription: ( localize(
-                4797,
+                4846,
                 "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,
@@ -218,7 +223,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4798,
+                4847,
                 "Whether to show a confirmation before removing a request and its associated edits."
             )),
             default: true,
@@ -227,7 +232,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4799,
+                4848,
                 "Whether to show a confirmation before retrying a request and its associated edits."
             )),
             default: true,
@@ -235,21 +240,21 @@ configurationRegistry.registerConfiguration({
         'chat.experimental.detectParticipant.enabled': {
             type: 'boolean',
             deprecationMessage: ( localize(
-                4800,
+                4849,
                 "This setting is deprecated. Please use `chat.detectParticipant.enabled` instead."
             )),
-            description: ( localize(4801, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4850, "Enables chat participant autodetection for panel chat.")),
             default: null
         },
         'chat.detectParticipant.enabled': {
             type: 'boolean',
-            description: ( localize(4802, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4851, "Enables chat participant autodetection for panel chat.")),
             default: true
         },
         'chat.renderRelatedFiles': {
             type: 'boolean',
             description: ( localize(
-                4803,
+                4852,
                 "Controls whether related files should be rendered in the chat input."
             )),
             default: false
@@ -257,25 +262,31 @@ configurationRegistry.registerConfiguration({
         'chat.notifyWindowOnConfirmation': {
             type: 'boolean',
             description: ( localize(
-                4804,
+                4853,
                 "Controls whether a chat session should present the user with an OS notification when a confirmation is needed while the window is not in focus. This includes a window badge as well as notification toast."
             )),
             default: true,
         },
         [ChatConfiguration.GlobalAutoApprove]: {
             default: false,
-            description: ( localize(
-                4805,
-                '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.'
-            )),
             markdownDescription: globalAutoApproveDescription.value,
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION_MACHINE,
             tags: ['experimental'],
             policy: {
                 name: 'ChatToolsAutoApprove',
+                category: PolicyCategory.InteractiveSession,
                 minimumVersion: '1.99',
                 value: (account) => account.chat_preview_features_enabled === false ? false : undefined,
+                localization: {
+                    description: {
+                        key: 'autoApprove2.description',
+                        value: ( localize(
+                            4854,
+                            '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.'
+                        ))
+                    }
+                },
             }
         },
         [ChatConfiguration.AutoApproveEdits]: {
@@ -284,10 +295,10 @@ configurationRegistry.registerConfiguration({
                 '**/.vscode/*.json': false,
                 '**/.git/**': false,
                 '**/{package.json,package-lock.json,server.xml,build.rs,web.config,.gitattributes,.env}': false,
-                '**/*.{csproj,fsproj,vbproj}': false,
+                '**/*.{csproj,fsproj,vbproj,vcxproj,proj,targets,props}': false,
             },
             markdownDescription: ( localize(
-                4806,
+                4855,
                 "Controls whether edits made by chat 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',
@@ -298,7 +309,7 @@ configurationRegistry.registerConfiguration({
         'chat.sendElementsToChat.enabled': {
             default: true,
             description: ( localize(
-                4807,
+                4856,
                 "Controls whether elements can be sent to chat from the Simple Browser."
             )),
             type: 'boolean',
@@ -307,7 +318,7 @@ configurationRegistry.registerConfiguration({
         'chat.sendElementsToChat.attachCSS': {
             default: true,
             markdownDescription: ( localize(
-                4808,
+                4857,
                 "Controls whether CSS of the selected element will be added to the chat. {0} must be enabled.",
                 '`#chat.sendElementsToChat.enabled#`'
             )),
@@ -317,7 +328,7 @@ configurationRegistry.registerConfiguration({
         'chat.sendElementsToChat.attachImages': {
             default: true,
             markdownDescription: ( localize(
-                4809,
+                4858,
                 "Controls whether a screenshot of the selected element will be added to the chat. {0} must be enabled.",
                 '`#chat.sendElementsToChat.enabled#`'
             )),
@@ -327,7 +338,7 @@ configurationRegistry.registerConfiguration({
         'chat.undoRequests.restoreInput': {
             default: true,
             markdownDescription: ( localize(
-                4810,
+                4859,
                 "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',
@@ -335,36 +346,24 @@ configurationRegistry.registerConfiguration({
         },
         'chat.editRequests': {
             markdownDescription: ( localize(
-                4811,
+                4860,
                 "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',
         },
-        'chat.emptyChatState.enabled': {
-            type: 'boolean',
-            default: true,
-            description: ( localize(
-                4812,
-                "Shows a modified empty chat state with hints in the input placeholder text."
-            )),
-            tags: ['experimental'],
-            experiment: {
-                mode: 'startup'
-            }
-        },
         [ChatConfiguration.EmptyStateHistoryEnabled]: {
             type: 'boolean',
             default: product.quality === 'insiders',
-            description: ( localize(4813, "Show recent chat history on the empty chat state.")),
+            description: ( localize(4861, "Show recent chat history on the empty chat state.")),
             tags: ['experimental']
         },
         [ChatConfiguration.NotifyWindowOnResponseReceived]: {
             type: 'boolean',
             default: true,
             description: ( localize(
-                4814,
+                4862,
                 "Controls whether a chat session should present the user with an OS notification when a response is received while the window is not in focus. This includes a window badge as well as notification toast."
             )),
         },
@@ -372,34 +371,35 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: true,
             description: ( localize(
-                4815,
+                4863,
                 "Enables checkpoints in chat. Checkpoints allow you to restore the chat to a previous state."
             )),
         },
         'chat.checkpoints.showFileChanges': {
             type: 'boolean',
-            description: ( localize(4816, "Controls whether to show chat checkpoint file changes.")),
+            description: ( localize(4864, "Controls whether to show chat checkpoint file changes.")),
             default: false
         },
         [mcpAccessConfig]: {
             type: 'string',
-            description: ( localize(4817, "Controls access to installed Model Context Protocol servers.")),
+            description: ( localize(4865, "Controls access to installed Model Context Protocol servers.")),
             enum: [
                 McpAccessValue.None,
                 McpAccessValue.Registry,
                 McpAccessValue.All
             ],
             enumDescriptions: [
-                ( localize(4818, "No access to MCP servers.")),
+                ( localize(4866, "No access to MCP servers.")),
                 ( localize(
-                4819,
+                4867,
                 "Allows access to MCP servers installed from the registry that VS Code is connected to."
             )),
-                ( localize(4820, "Allow access to any installed MCP server."))
+                ( localize(4868, "Allow access to any installed MCP server."))
             ],
             default: McpAccessValue.All,
             policy: {
                 name: 'ChatMCP',
+                category: PolicyCategory.InteractiveSession,
                 minimumVersion: '1.99',
                 value: (account) => {
                     if (account.mcp === false) {
@@ -410,12 +410,32 @@ configurationRegistry.registerConfiguration({
                     }
                     return undefined;
                 },
+                localization: {
+                    description: {
+                        key: 'chat.mcp.access',
+                        value: ( localize(4865, "Controls access to installed Model Context Protocol servers."))
+                    },
+                    enumDescriptions: [
+                        {
+                            key: 'chat.mcp.access.none', value: ( localize(4866, "No access to MCP servers.")),
+                        },
+                        {
+                            key: 'chat.mcp.access.registry', value: ( localize(
+                            4867,
+                            "Allows access to MCP servers installed from the registry that VS Code is connected to."
+                        )),
+                        },
+                        {
+                            key: 'chat.mcp.access.any', value: ( localize(4868, "Allow access to any installed MCP server."))
+                        }
+                    ]
+                },
             }
         },
         [mcpAutoStartConfig]: {
             type: 'string',
             description: ( localize(
-                4821,
+                4869,
                 "Controls whether MCP servers should be automatically started when the chat messages are submitted."
             )),
             default: McpAutoStartValue.NewAndOutdated,
@@ -425,10 +445,10 @@ configurationRegistry.registerConfiguration({
                 McpAutoStartValue.NewAndOutdated
             ],
             enumDescriptions: [
-                ( localize(4822, "Never automatically start MCP servers.")),
-                ( localize(4823, "Only automatically start new MCP servers that have never been run.")),
+                ( localize(4870, "Never automatically start MCP servers.")),
+                ( localize(4871, "Only automatically start new MCP servers that have never been run.")),
                 ( localize(
-                4824,
+                4872,
                 "Automatically start new and outdated MCP servers that are not yet running."
             ))
             ],
@@ -437,9 +457,9 @@ configurationRegistry.registerConfiguration({
         [mcpServerSamplingSection]: {
             type: 'object',
             description: ( localize(
-                4825,
+                4873,
                 "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(4826, 'List Servers'))
+                'MCP: ' + ( localize(4874, 'List Servers'))
             )),
             scope: ConfigurationScope.RESOURCE,
             additionalProperties: {
@@ -448,7 +468,7 @@ configurationRegistry.registerConfiguration({
                     allowedDuringChat: {
                         type: 'boolean',
                         description: ( localize(
-                            4827,
+                            4875,
                             "Whether this server is make sampling requests during its tool calls in a chat session."
                         )),
                         default: true,
@@ -456,7 +476,7 @@ configurationRegistry.registerConfiguration({
                     allowedOutsideChat: {
                         type: 'boolean',
                         description: ( localize(
-                            4828,
+                            4876,
                             "Whether this server is allowed to make sampling requests outside of a chat session."
                         )),
                         default: false,
@@ -465,7 +485,7 @@ configurationRegistry.registerConfiguration({
                         type: 'array',
                         items: {
                             type: 'string',
-                            description: ( localize(4829, "A model the MCP server has access to.")),
+                            description: ( localize(4877, "A model the MCP server has access to.")),
                         },
                     }
                 }
@@ -474,7 +494,7 @@ configurationRegistry.registerConfiguration({
         [AssistedTypes[AddConfigurationType.NuGetPackage].enabledConfigKey]: {
             type: 'boolean',
             description: ( localize(
-                4830,
+                4878,
                 "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,
@@ -486,45 +506,61 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.Edits2Enabled]: {
             type: 'boolean',
             description: ( localize(
-                4831,
+                4879,
                 "Enable the new Edits mode that is based on tool-calling. When this is enabled, models that don't support tool-calling are unavailable for Edits mode."
             )),
             default: false,
         },
         [ChatConfiguration.ExtensionToolsEnabled]: {
             type: 'boolean',
-            description: ( localize(4832, "Enable using tools contributed by third-party extensions.")),
+            description: ( localize(4880, "Enable using tools contributed by third-party extensions.")),
             default: true,
             policy: {
                 name: 'ChatAgentExtensionTools',
+                category: PolicyCategory.InteractiveSession,
                 minimumVersion: '1.99',
-                description: ( localize(4833, "Enable using tools contributed by third-party extensions.")),
+                localization: {
+                    description: {
+                        key: 'chat.extensionToolsEnabled',
+                        value: ( localize(4880, "Enable using tools contributed by third-party extensions."))
+                    }
+                },
             }
         },
         [ChatConfiguration.AgentEnabled]: {
             type: 'boolean',
             description: ( localize(
-                4834,
+                4881,
                 "Enable agent mode for chat. When this is enabled, agent mode can be activated via the dropdown in the view."
             )),
             default: true,
             policy: {
                 name: 'ChatAgentMode',
+                category: PolicyCategory.InteractiveSession,
                 minimumVersion: '1.99',
                 value: (account) => account.chat_agent_enabled === false ? false : undefined,
+                localization: {
+                    description: {
+                        key: 'chat.agent.enabled.description',
+                        value: ( localize(
+                            4881,
+                            "Enable agent mode for chat. When this is enabled, agent mode can be activated via the dropdown in the view."
+                        )),
+                    }
+                }
             }
         },
         [ChatConfiguration.EnableMath]: {
             type: 'boolean',
-            description: ( localize(4835, "Enable math rendering in chat responses using KaTeX.")),
+            description: ( localize(4882, "Enable math rendering in chat responses using KaTeX.")),
             default: true,
             tags: ['preview'],
         },
         [ChatConfiguration.AgentSessionsViewLocation]: {
             type: 'string',
-            enum: ['disabled', 'view'],
-            description: ( localize(4836, "Controls where to show the agent sessions menu.")),
-            default: 'disabled',
+            enum: ['disabled', 'view', 'single-view'],
+            description: ( localize(4883, "Controls where to show the agent sessions menu.")),
+            default: 'view',
             tags: ['experimental'],
             experiment: {
                 mode: 'auto'
@@ -538,7 +574,7 @@ configurationRegistry.registerConfiguration({
             additionalProperties: false,
             default: Object.fromEntries(( allDiscoverySources.map(k => [k, false]))),
             markdownDescription: ( localize(
-                4837,
+                4884,
                 "Configures discovery of Model Context Protocol servers from configuration from various other applications."
             )),
         },
@@ -547,49 +583,36 @@ configurationRegistry.registerConfiguration({
             default: false,
             tags: ['preview'],
             description: ( localize(
-                4838,
+                4885,
                 "Enables the default Marketplace for Model Context Protocol (MCP) servers."
             )),
             included: product.quality === 'stable'
         },
         [mcpGalleryServiceUrlConfig]: {
             type: 'string',
-            description: ( localize(4839, "Configure the MCP Gallery service URL to connect to")),
+            description: ( localize(4886, "Configure the MCP Gallery service URL to connect to")),
             default: '',
             scope: ConfigurationScope.APPLICATION,
-            tags: ['usesOnlineServices'],
+            tags: ['usesOnlineServices', 'advanced'],
             included: false,
             policy: {
                 name: 'McpGalleryServiceUrl',
+                category: PolicyCategory.InteractiveSession,
                 minimumVersion: '1.101',
-                value: (account) => account.mcpRegistryUrl
+                value: (account) => account.mcpRegistryUrl,
+                localization: {
+                    description: {
+                        key: 'mcp.gallery.serviceUrl',
+                        value: ( localize(4886, "Configure the MCP Gallery service URL to connect to")),
+                    }
+                }
             },
         },
-        [PromptsConfig.KEY]: {
-            type: 'boolean',
-            title: ( localize(4840, "Prompt Files")),
-            markdownDescription: ( localize(
-                4841,
-                "Enable reusable prompt (`*{0}`) and instruction files (`*{1}`) in Chat sessions. [Learn More]({2}).",
-                PROMPT_FILE_EXTENSION,
-                INSTRUCTION_FILE_EXTENSION,
-                PROMPT_DOCUMENTATION_URL
-            )),
-            default: true,
-            restricted: true,
-            disallowConfigurationDefault: true,
-            tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
-            policy: {
-                name: 'ChatPromptFiles',
-                minimumVersion: '1.99',
-                description: ( localize(4842, "Enables reusable prompt and instruction files in Chat sessions."))
-            }
-        },
         [PromptsConfig.INSTRUCTIONS_LOCATION_KEY]: {
             type: 'object',
-            title: ( localize(4843, "Instructions File Locations")),
+            title: ( localize(4887, "Instructions File Locations")),
             markdownDescription: ( localize(
-                4844,
+                4888,
                 "Specify location(s) of instructions files (`*{0}`) that can be attached in Chat sessions. [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
                 INSTRUCTION_FILE_EXTENSION,
                 INSTRUCTIONS_DOCUMENTATION_URL
@@ -599,7 +622,7 @@ configurationRegistry.registerConfiguration({
             },
             additionalProperties: { type: 'boolean' },
             restricted: true,
-            tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
+            tags: ['prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
             examples: [
                 {
                     [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true,
@@ -612,9 +635,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.PROMPT_LOCATIONS_KEY]: {
             type: 'object',
-            title: ( localize(4845, "Prompt File Locations")),
+            title: ( localize(4889, "Prompt File Locations")),
             markdownDescription: ( localize(
-                4846,
+                4890,
                 "Specify location(s) of reusable prompt files (`*{0}`) that can be run in Chat sessions. [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
                 PROMPT_FILE_EXTENSION,
                 PROMPT_DOCUMENTATION_URL
@@ -625,7 +648,7 @@ configurationRegistry.registerConfiguration({
             additionalProperties: { type: 'boolean' },
             unevaluatedProperties: { type: 'boolean' },
             restricted: true,
-            tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
+            tags: ['prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
             examples: [
                 {
                     [PROMPT_DEFAULT_SOURCE_FOLDER]: true,
@@ -638,35 +661,39 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.MODE_LOCATION_KEY]: {
             type: 'object',
-            title: ( localize(4847, "Mode File Locations")),
+            title: ( localize(4891, "Mode File Locations")),
             markdownDescription: ( localize(
-                4848,
+                4892,
                 "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.",
-                MODE_FILE_EXTENSION,
-                MODE_DOCUMENTATION_URL
+                LEGACY_MODE_FILE_EXTENSION,
+                AGENT_DOCUMENTATION_URL
             )),
             default: {
-                [MODE_DEFAULT_SOURCE_FOLDER]: true,
+                [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true,
             },
+            deprecationMessage: ( localize(
+                4893,
+                "This setting is deprecated and will be removed in future releases. Chat modes are now called custom agents and are located in `.github/agents`"
+            )),
             additionalProperties: { type: 'boolean' },
             unevaluatedProperties: { type: 'boolean' },
             restricted: true,
             tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
             examples: [
                 {
-                    [MODE_DEFAULT_SOURCE_FOLDER]: true,
+                    [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true,
                 },
                 {
-                    [MODE_DEFAULT_SOURCE_FOLDER]: true,
+                    [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true,
                     '/Users/vscode/repos/chatmodes': true,
                 },
             ],
         },
         [PromptsConfig.USE_AGENT_MD]: {
             type: 'boolean',
-            title: ( localize(4849, "Use AGENTS.MD file")),
+            title: ( localize(4894, "Use AGENTS.MD file")),
             markdownDescription: ( localize(
-                4850,
+                4895,
                 "Controls whether instructions from `AGENTS.MD` file found in a workspace roots are added to all chat requests."
             )),
             default: true,
@@ -676,9 +703,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.USE_NESTED_AGENT_MD]: {
             type: 'boolean',
-            title: ( localize(4851, "Use nested AGENTS.MD files")),
+            title: ( localize(4896, "Use nested AGENTS.MD files")),
             markdownDescription: ( localize(
-                4852,
+                4897,
                 "Controls whether instructions `AGENTS.MD` files found in the workspace are listed in all chat requests."
             )),
             default: false,
@@ -689,9 +716,9 @@ configurationRegistry.registerConfiguration({
         [PromptsConfig.PROMPT_FILES_SUGGEST_KEY]: {
             type: 'object',
             scope: ConfigurationScope.RESOURCE,
-            title: ( localize(4853, "Prompt File Recommendations")),
+            title: ( localize(4898, "Prompt File Recommendations")),
             markdownDescription: ( localize(
-                4854,
+                4899,
                 "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: {},
@@ -701,7 +728,7 @@ configurationRegistry.registerConfiguration({
                     { type: 'string' }
                 ]
             },
-            tags: ['experimental'],
+            tags: ['prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
             examples: [
                 {
                     'plan': true,
@@ -710,41 +737,13 @@ configurationRegistry.registerConfiguration({
                 }
             ],
         },
-        'chat.setup.signInDialogVariant': {
-            type: 'string',
-            enum: ['default', 'apple'],
-            description: ( localize(4855, "Control variations of the sign-in dialog.")),
-            default: 'default',
-            tags: ['experimental'],
-            experiment: {
-                mode: 'auto'
-            }
-        },
-        [ChatConfiguration.TodoList]: {
-            type: 'object',
-            description: ( localize(4856, "Configures the todo list widget in chat.")),
-            properties: {
-                position: {
-                    type: 'string',
-                    default: 'default',
-                    enum: ['default', 'off', 'chat-input'],
-                    enumDescriptions: [
-                        ( localize(4857, "Show todo list in the top of the chat panel.")),
-                        ( localize(
-                        4858,
-                        "Hide the todo list (still shows the tool calls for tracking todo progress)."
-                    )),
-                        ( localize(4859, "Show todo list above the chat input."))
-                    ],
-                    description: ( localize(
-                        4860,
-                        "Controls the position of the todo list in the chat view, which opens when the agent has created todo items and updates as it makes progress."
-                    ))
-                }
-            },
-            default: {
-                position: 'default'
-            },
+        [ChatConfiguration.TodosShowWidget]: {
+            type: 'boolean',
+            default: true,
+            description: ( localize(
+                4900,
+                "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."
+            )),
             tags: ['experimental'],
             experiment: {
                 mode: 'auto'
@@ -754,79 +753,127 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: false,
             description: ( localize(
-                4861,
+                4901,
                 "When enabled, the todo tool operates in write-only mode, requiring the agent to remember todos in context."
             )),
-            tags: ['experimental']
+            tags: ['experimental'],
+            experiment: {
+                mode: 'auto'
+            }
         },
         'chat.todoListTool.descriptionField': {
             type: 'boolean',
             default: true,
             description: ( localize(
-                4862,
+                4902,
                 "When enabled, todo items include detailed descriptions for implementation context. This provides more information but uses additional tokens and may slow down responses."
             )),
-            tags: ['experimental']
+            tags: ['experimental'],
+            experiment: {
+                mode: 'auto'
+            }
         },
         [ChatConfiguration.ThinkingStyle]: {
             type: 'string',
-            default: product.quality === 'insider' ? 'fixedScrolling' : 'collapsed',
-            enum: ['collapsed', 'collapsedPreview', 'expanded', 'none', 'collapsedPerItem', 'fixedScrolling'],
+            default: 'fixedScrolling',
+            enum: ['collapsed', 'collapsedPreview', 'fixedScrolling'],
             enumDescriptions: [
-                ( localize(4863, "Thinking parts will be collapsed by default.")),
+                ( localize(4903, "Thinking parts will be collapsed by default.")),
                 ( localize(
-                4864,
+                4904,
                 "Thinking parts will be expanded first, then collapse once we reach a part that is not thinking."
             )),
-                ( localize(4865, "Thinking parts will be expanded by default.")),
-                ( localize(4866, "Do not show the thinking")),
                 ( localize(
-                4867,
-                "Each thinking subsection is individually collapsible and collapsed by default inside the thinking block."
+                4905,
+                "Show thinking in a fixed-height streaming panel that auto-scrolls; click header to expand to full height."
             )),
+            ],
+            description: ( localize(4906, "Controls how thinking is rendered.")),
+            tags: ['experimental'],
+        },
+        'chat.agent.thinking.collapsedTools': {
+            type: 'string',
+            default: 'readOnly',
+            enum: ['none', 'all', 'readOnly'],
+            enumDescriptions: [
+                ( localize(4907, "No tool calls are added into the collapsible thinking section.")),
+                ( localize(4908, "All tool calls are added into the collapsible thinking section.")),
                 ( localize(
-                4868,
-                "Show thinking in a fixed-height streaming panel that auto-scrolls; click header to expand to full height."
+                4909,
+                "Only read-only tool calls are added into the collapsible thinking section."
             )),
             ],
-            description: ( localize(4869, "Controls how thinking is rendered.")),
+            markdownDescription: ( localize(
+                4910,
+                "When enabled, tool calls are added into the collapsible thinking section according to the selected mode."
+            )),
             tags: ['experimental'],
         },
         'chat.disableAIFeatures': {
             type: 'boolean',
             description: ( localize(
-                4870,
-                "Disable and hide built-in AI features provided by GitHub Copilot, including chat, code completions and next edit suggestions."
+                4911,
+                "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."
             )),
             default: false,
             scope: ConfigurationScope.WINDOW
         },
         [ChatConfiguration.UseCloudButtonV2]: {
             type: 'boolean',
-            description: ( localize(4871, "Experimental implementation of 'cloud button'")),
-            default: false,
+            description: ( localize(4912, "Experimental implementation of 'cloud button'")),
+            default: true,
             tags: ['experimental'],
         },
         [ChatConfiguration.ShowAgentSessionsViewDescription]: {
             type: 'boolean',
             description: ( localize(
-                4872,
+                4913,
                 "Controls whether session descriptions are displayed on a second row in the Chat Sessions view."
             )),
             default: true,
         },
         'chat.allowAnonymousAccess': {
             type: 'boolean',
-            description: ( localize(4873, "Controls whether anonymous access is allowed in chat.")),
+            description: ( localize(4914, "Controls whether anonymous access is allowed in chat.")),
+            default: false,
+            tags: ['experimental'],
+            experiment: {
+                mode: 'auto'
+            }
+        },
+        'chat.signInWithAlternateScopes': {
+            type: 'boolean',
+            description: ( localize(4915, "Controls whether sign-in with alternate scopes is used.")),
+            default: false,
+            tags: ['experimental'],
+            experiment: {
+                mode: 'auto'
+            }
+        },
+        'chat.extensionUnification.enabled': {
+            type: 'boolean',
+            description: ( localize(
+                4916,
+                "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: false,
             tags: ['experimental'],
             experiment: {
                 mode: 'auto'
             }
         },
+        [ChatConfiguration.SubagentToolCustomAgents]: {
+            type: 'boolean',
+            description: ( localize(
+                4917,
+                "Whether the runSubagent tool is able to use custom agents. When enabled, the tool can take the name of a custom agent, but it must be given the exact name of the agent."
+            )),
+            default: false,
+            tags: ['experimental'],
+        }
     }
 });
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4874, "Chat"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4918, "Chat"))), [
     ( new SyncDescriptor(ChatEditorInput))
 ]);
 ( Registry.as(Extensions$1.ConfigurationMigration)).registerConfigurationMigrations([
@@ -849,25 +896,47 @@ configurationRegistry.registerConfiguration({
 ]);
 let ChatResolverContribution = class ChatResolverContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatResolver'; }
-    constructor(editorResolverService, instantiationService) {
+    constructor(chatSessionsService, editorResolverService, instantiationService) {
         super();
-        this._register(editorResolverService.registerEditor(`{${Schemas.vscodeChatEditor},${Schemas.vscodeChatSession}}:**/**`, {
+        this.editorResolverService = editorResolverService;
+        this.instantiationService = instantiationService;
+        this._editorRegistrations = this._register(( new DisposableMap()));
+        this._registerEditor(Schemas.vscodeChatEditor);
+        this._registerEditor(Schemas.vscodeLocalChatSession);
+        this._register(chatSessionsService.onDidChangeContentProviderSchemes((e) => {
+            for (const scheme of e.added) {
+                this._registerEditor(scheme);
+            }
+            for (const scheme of e.removed) {
+                this._editorRegistrations.deleteAndDispose(scheme);
+            }
+        }));
+        for (const scheme of chatSessionsService.getContentProviderSchemes()) {
+            this._registerEditor(scheme);
+        }
+    }
+    _registerEditor(scheme) {
+        this._editorRegistrations.set(scheme, this.editorResolverService.registerEditor(`${scheme}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localize(4874, "Chat")),
+            label: ( localize(4918, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
-            canSupportResource: resource => resource.scheme === Schemas.vscodeChatEditor || resource.scheme === Schemas.vscodeChatSession,
+            canSupportResource: resource => resource.scheme === scheme,
         }, {
             createEditorInput: ({ resource, options }) => {
-                return { editor: instantiationService.createInstance(ChatEditorInput, resource, options), options };
+                return {
+                    editor: this.instantiationService.createInstance(ChatEditorInput, resource, options),
+                    options
+                };
             }
         }));
     }
 };
 ChatResolverContribution = ( __decorate([
-    ( __param(0, IEditorResolverService)),
-    ( __param(1, IInstantiationService))
+    ( __param(0, IChatSessionsService)),
+    ( __param(1, IEditorResolverService)),
+    ( __param(2, IInstantiationService))
 ], ChatResolverContribution));
 let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatAgentSetting'; }
@@ -887,14 +956,14 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Di
                 const defaultValue = value ?? (this.entitlementService.entitlement === ChatEntitlement.Free ? 25 : 25);
                 const node = {
                     id: 'chatSidebar',
-                    title: ( localize(4782, "Chat")),
+                    title: ( localize(4831, "Chat")),
                     type: 'object',
                     properties: {
                         'chat.agent.maxRequests': {
                             type: 'number',
                             markdownDescription: ( localize(
-                                4875,
-                                "The maximum number of requests to allow per-turn in agent mode. When the limit is reached, will ask to confirm to continue."
+                                4919,
+                                "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: defaultValue,
                         },
@@ -923,26 +992,13 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
         super();
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'clear',
-            detail: ( localize(4876, "Start a new chat")),
+            detail: ( localize(4920, "Start a new chat")),
             sortText: 'z2_clear',
             executeImmediately: true,
             locations: [ChatAgentLocation.Chat]
         }, async () => {
             commandService.executeCommand(ACTION_ID_NEW_CHAT);
         }));
-        this._store.add(slashCommandService.registerSlashCommand({
-            command: SAVE_TO_PROMPT_SLASH_COMMAND_NAME,
-            detail: ( localize(4877, "Save chat to a prompt file")),
-            sortText: `z3_${SAVE_TO_PROMPT_SLASH_COMMAND_NAME}`,
-            executeImmediately: true,
-            silent: true,
-            locations: [ChatAgentLocation.Chat]
-        }, async () => {
-            const { lastFocusedWidget } = chatWidgetService;
-            assertDefined(lastFocusedWidget, 'No currently active chat widget found.');
-            const options = { chat: lastFocusedWidget };
-            return commandService.executeCommand(SAVE_TO_PROMPT_ACTION_ID, options);
-        }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'help',
             detail: '',
@@ -1022,7 +1078,9 @@ registerWorkbenchContribution2(ChatTransferContribution.ID, ChatTransferContribu
 registerWorkbenchContribution2(ChatContextContributions.ID, ChatContextContributions, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(ChatResponseResourceFileSystemProvider.ID, ChatResponseResourceFileSystemProvider, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(PromptUrlHandler.ID, PromptUrlHandler, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(ChatSessionsView.ID, ChatSessionsView, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(LocalChatSessionsProvider.ID, LocalChatSessionsProvider, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(ChatSessionsViewContrib.ID, ChatSessionsViewContrib, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(ChatSessionsView.ID, ChatSessionsView, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(UserToolSetsContributions.ID, UserToolSetsContributions, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(PromptLanguageFeaturesProvider.ID, PromptLanguageFeaturesProvider, WorkbenchPhase.Eventually);
@@ -1053,4 +1111,5 @@ registerAction2(OpenChatSessionInNewEditorGroupAction);
 registerAction2(OpenChatSessionInSidebarAction);
 registerAction2(ToggleChatSessionsDescriptionDisplayAction);
 registerAction2(ChatSessionsGettingStartedAction);
+registerAction2(ToggleAgentSessionsViewLocationAction);
 ChatWidget.CONTRIBS.push(ChatDynamicVariableModel);