@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

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

@@ -1,8 +1,5 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { PolicyTag } from '../../../../base/common/policy.js';
-import './promptSyntax/promptToolsCodeLensProvider.js';
-import './promptSyntax/promptCodingAgentActionContribution.js';
 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';
@@ -13,45 +10,49 @@ import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/commo
 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 { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { Extensions, 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 { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { mcpGalleryServiceUrlConfig, mcpAutoStartConfig, McpAutoStartValue, mcpEnabledConfig } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
-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 { mcpGalleryServiceUrlConfig, mcpAutoStartConfig, McpAutoStartValue, mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
 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 { EditorPaneDescriptor } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-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 { 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 { mcpDiscoverySection, allDiscoverySources, discoverySourceLabel, mcpServerSamplingSection } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+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 { 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-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementService.service';
-import { chatVariableLeader } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes';
+import { ChatResponseResourceFileSystemProvider } from '../common/chatResponseResourceFileSystemProvider.js';
 import '../common/chatServiceImpl.js';
 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 { 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 { 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 { 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 { registerPromptFileContributions } 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 '../common/promptSyntax/service/promptsServiceImpl.js';
 import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
 import { BuiltinToolsContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/tools';
-import { UserToolSetsContributions, ConfigureToolSets } from './tools/toolSetsContribution.js';
 import '../common/voiceChatService.js';
 import { PanelChatAccessibilityHelp, QuickChatAccessibilityHelp, EditsChatAccessibilityHelp, AgentChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
+import { registerChatAccessibilityActions } from './actions/chatAccessibilityActions.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 { CodeBlockActionRendering, registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from './actions/chatCodeblockActions.js';
@@ -63,6 +64,7 @@ import { ChatSubmitAction, registerChatExecuteActions } from '@codingame/monaco-
 import { registerChatFileTreeActions } from './actions/chatFileTreeActions.js';
 import { ChatGettingStartedContribution } from './actions/chatGettingStarted.js';
 import { registerChatExportActions } from './actions/chatImportExport.js';
+import { registerLanguageModelActions } from './actions/chatLanguageModelActions.js';
 import { registerMoveActions } from './actions/chatMoveActions.js';
 import { registerQuickChatActions } from './actions/chatQuickInputActions.js';
 import { registerChatTitleActions } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
@@ -71,6 +73,7 @@ import { ChatTransferContribution } from './actions/chatTransfer.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 './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';
@@ -86,65 +89,75 @@ import { SimpleBrowserOverlay } from './chatEditing/simpleBrowserEditorOverlay.j
 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 { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
+import './chatOutputItemRenderer.js';
 import { ChatExtensionPointHandler, ChatCompatibilityNotifier } from './chatParticipant.contribution.js';
 import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
 import './chatQuick.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
-import { ChatSetupContribution } from './chatSetup.js';
+import { ChatSessionsView } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/chatSessions';
+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 '@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 './languageModelToolsService.js';
-import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
-import { registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes';
-import { ChatResponseResourceFileSystemProvider } from '../common/chatResponseResourceFileSystemProvider.js';
-import { SAVE_TO_PROMPT_SLASH_COMMAND_NAME, SAVE_TO_PROMPT_ACTION_ID } from './promptSyntax/saveToPromptAction.js';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import './chatAttachmentResolveService.js';
-import { registerLanguageModelActions } from './actions/chatLanguageModelActions.js';
+import { globalAutoApproveDescription } from './languageModelToolsService.js';
+import './promptSyntax/promptCodingAgentActionContribution.js';
+import './promptSyntax/promptToolsCodeLensProvider.js';
 import { PromptUrlHandler } from './promptSyntax/promptUrlHandler.js';
-import '../common/chatTodoListService.js';
-import './chatOutputItemRenderer.js';
-import { AssistedTypes, AddConfigurationType } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration';
-import { ChatSessionsView } from './chatSessions.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 { RenameChatSessionAction, DeleteChatSessionAction, OpenChatSessionInNewEditorGroupAction, OpenChatSessionInSidebarAction, ToggleChatSessionsDescriptionDisplayAction } from './actions/chatSessionActions.js';
+import './chatLayoutService.js';
 
 const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'chatSidebar',
-    title: ( localize(4703, "Chat")),
+    title: ( localize(4752, "Chat")),
     type: 'object',
     properties: {
+        'chat.fontSize': {
+            type: 'number',
+            description: ( localize(4753, "Controls the font size in pixels in chat messages.")),
+            default: 13,
+            minimum: 6,
+            maximum: 100
+        },
+        'chat.fontFamily': {
+            type: 'string',
+            description: ( localize(4754, "Controls the font family in chat messages.")),
+            default: 'default'
+        },
         'chat.editor.fontSize': {
             type: 'number',
-            description: ( localize(4704, "Controls the font size in pixels in chat codeblocks.")),
+            description: ( localize(4755, "Controls the font size in pixels in chat codeblocks.")),
             default: isMacintosh ? 12 : 14,
         },
         'chat.editor.fontFamily': {
             type: 'string',
-            description: ( localize(4705, "Controls the font family in chat codeblocks.")),
+            description: ( localize(4756, "Controls the font family in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.fontWeight': {
             type: 'string',
-            description: ( localize(4706, "Controls the font weight in chat codeblocks.")),
+            description: ( localize(4757, "Controls the font weight in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.wordWrap': {
             type: 'string',
-            description: ( localize(4707, "Controls whether lines should wrap in chat codeblocks.")),
+            description: ( localize(4758, "Controls whether lines should wrap in chat codeblocks.")),
             default: 'off',
             enum: ['on', 'off']
         },
         'chat.editor.lineHeight': {
             type: 'number',
             description: ( localize(
-                4708,
+                4759,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
@@ -152,8 +165,8 @@ configurationRegistry.registerConfiguration({
         'chat.commandCenter.enabled': {
             type: 'boolean',
             markdownDescription: ( localize(
-                4709,
-                "Controls whether the command center shows a menu for actions to control Copilot (requires {0}).",
+                4760,
+                "Controls whether the command center shows a menu for actions to control chat (requires {0}).",
                 '`#window.commandCenter#`'
             )),
             default: true
@@ -162,17 +175,17 @@ configurationRegistry.registerConfiguration({
             type: 'object',
             tags: ['experimental'],
             description: ( localize(
-                4710,
+                4761,
                 "Enables automatically using the active editor as chat context for specified chat locations."
             )),
             additionalProperties: {
                 type: 'string',
                 enum: ['never', 'first', 'always'],
-                description: ( localize(4711, "The value for the implicit context.")),
+                description: ( localize(4762, "The value for the implicit context.")),
                 enumDescriptions: [
-                    ( localize(4712, "Implicit context is never enabled.")),
-                    ( localize(4713, "Implicit context is enabled for the first interaction.")),
-                    ( localize(4714, "Implicit context is always enabled."))
+                    ( localize(4763, "Implicit context is never enabled.")),
+                    ( localize(4764, "Implicit context is enabled for the first interaction.")),
+                    ( localize(4765, "Implicit context is always enabled."))
                 ]
             },
             default: {
@@ -183,7 +196,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             tags: ['experimental'],
             markdownDescription: ( localize(
-                4715,
+                4766,
                 "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."
             )),
             default: true,
@@ -191,7 +204,7 @@ configurationRegistry.registerConfiguration({
         'chat.editing.autoAcceptDelay': {
             type: 'number',
             markdownDescription: ( localize(
-                4716,
+                4767,
                 "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,
@@ -202,7 +215,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4717,
+                4768,
                 "Whether to show a confirmation before removing a request and its associated edits."
             )),
             default: true,
@@ -211,7 +224,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4718,
+                4769,
                 "Whether to show a confirmation before retrying a request and its associated edits."
             )),
             default: true,
@@ -219,21 +232,21 @@ configurationRegistry.registerConfiguration({
         'chat.experimental.detectParticipant.enabled': {
             type: 'boolean',
             deprecationMessage: ( localize(
-                4719,
+                4770,
                 "This setting is deprecated. Please use `chat.detectParticipant.enabled` instead."
             )),
-            description: ( localize(4720, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4771, "Enables chat participant autodetection for panel chat.")),
             default: null
         },
         'chat.detectParticipant.enabled': {
             type: 'boolean',
-            description: ( localize(4721, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4772, "Enables chat participant autodetection for panel chat.")),
             default: true
         },
         'chat.renderRelatedFiles': {
             type: 'boolean',
             description: ( localize(
-                4722,
+                4773,
                 "Controls whether related files should be rendered in the chat input."
             )),
             default: false
@@ -241,35 +254,48 @@ configurationRegistry.registerConfiguration({
         'chat.notifyWindowOnConfirmation': {
             type: 'boolean',
             description: ( localize(
-                4723,
-                "Controls whether the Copilot window should notify the user when a confirmation is needed while the window is not in focus. This includes a window badge as well as notification toast."
+                4774,
+                "Controls whether a chat session should notify the user when a confirmation is needed while the window is not in focus. This includes a window badge as well as notification toast."
             )),
             default: true,
         },
-        'chat.tools.autoApprove': {
+        [ChatConfiguration.GlobalAutoApprove]: {
             default: false,
             description: ( localize(
-                4724,
-                "Controls whether tool use should be automatically approved. Allow all tools to run automatically without user confirmation, overriding any tool-specific settings such as terminal auto-approval. Use with caution: carefully review selected tools and be extra wary of possible sources of prompt injection!"
-            )),
-            markdownDescription: ( localize(
-                4725,
-                "Controls whether tool use should be automatically approved.\n\nAllows _all_ tools to run automatically without user confirmation, overriding any tool-specific settings such as terminal auto-approval.\n\nUse with caution: carefully review selected tools and be extra wary of possible sources of prompt injection!"
+                4775,
+                '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',
                 minimumVersion: '1.99',
-                defaultValue: false,
-                tags: [PolicyTag.Account, PolicyTag.Preview]
+                value: (account) => account.chat_preview_features_enabled === false ? false : undefined,
+            }
+        },
+        [ChatConfiguration.AutoApproveEdits]: {
+            default: {
+                '**/*': true,
+                '**/.vscode/*.json': false,
+                '**/.git/**': false,
+                '**/{package.json,package-lock.json,server.xml,build.rs,web.config,.gitattributes,.env}': false,
+                '**/*.{csproj,fsproj,vbproj}': false,
+            },
+            markdownDescription: ( localize(
+                4776,
+                "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\nFiles are matched against the glob patterns in the order they are specified."
+            )),
+            type: 'object',
+            additionalProperties: {
+                type: 'boolean',
             }
         },
         'chat.sendElementsToChat.enabled': {
             default: true,
             description: ( localize(
-                4726,
+                4777,
                 "Controls whether elements can be sent to chat from the Simple Browser."
             )),
             type: 'boolean',
@@ -278,7 +304,7 @@ configurationRegistry.registerConfiguration({
         'chat.sendElementsToChat.attachCSS': {
             default: true,
             markdownDescription: ( localize(
-                4727,
+                4778,
                 "Controls whether CSS of the selected element will be added to the chat. {0} must be enabled.",
                 '`#chat.sendElementsToChat.enabled#`'
             )),
@@ -288,7 +314,7 @@ configurationRegistry.registerConfiguration({
         'chat.sendElementsToChat.attachImages': {
             default: true,
             markdownDescription: ( localize(
-                4728,
+                4779,
                 "Controls whether a screenshot of the selected element will be added to the chat. {0} must be enabled.",
                 '`#chat.sendElementsToChat.enabled#`'
             )),
@@ -298,7 +324,7 @@ configurationRegistry.registerConfiguration({
         'chat.undoRequests.restoreInput': {
             default: true,
             markdownDescription: ( localize(
-                4729,
+                4780,
                 "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',
@@ -306,7 +332,7 @@ configurationRegistry.registerConfiguration({
         },
         'chat.editRequests': {
             markdownDescription: ( localize(
-                4730,
+                4781,
                 "Enables editing of requests in the chat. This allows you to change the request content and resubmit it to the model."
             )),
             type: 'string',
@@ -317,7 +343,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: true,
             description: ( localize(
-                4731,
+                4782,
                 "Shows a modified empty chat state with hints in the input placeholder text."
             )),
             tags: ['experimental'],
@@ -325,37 +351,57 @@ configurationRegistry.registerConfiguration({
                 mode: 'startup'
             }
         },
+        [ChatConfiguration.EmptyStateHistoryEnabled]: {
+            type: 'boolean',
+            default: false,
+            description: ( localize(4783, "Show recent chat history on the empty chat state.")),
+            tags: ['experimental']
+        },
         'chat.checkpoints.enabled': {
             type: 'boolean',
             default: true,
             description: ( localize(
-                4732,
+                4784,
                 "Enables checkpoints in chat. Checkpoints allow you to restore the chat to a previous state."
             )),
-            tags: ['preview'],
         },
         'chat.checkpoints.showFileChanges': {
             type: 'boolean',
-            description: ( localize(4733, "Controls whether to show chat checkpoint file changes.")),
+            description: ( localize(4785, "Controls whether to show chat checkpoint file changes.")),
             default: false
         },
-        [mcpEnabledConfig]: {
-            type: 'boolean',
-            description: ( localize(
-                4734,
-                "Enables integration with Model Context Protocol servers to provide additional tools and functionality."
-            )),
-            default: true,
+        [mcpAccessConfig]: {
+            type: 'string',
+            description: ( localize(4786, "Controls access to Model Context Protocol servers.")),
+            enum: [
+                McpAccessValue.None,
+                McpAccessValue.Registry,
+                McpAccessValue.All
+            ],
+            enumDescriptions: [
+                ( localize(4787, "No access to MCP servers.")),
+                ( localize(4788, "Only allow access to MCP servers from the registry.")),
+                ( localize(4789, "Allow access to any MCP server."))
+            ],
+            default: McpAccessValue.All,
             policy: {
                 name: 'ChatMCP',
                 minimumVersion: '1.99',
-                tags: [PolicyTag.Account, PolicyTag.MCP]
+                value: (account) => {
+                    if (account.mcp === false) {
+                        return McpAccessValue.None;
+                    }
+                    if (account.mcpAccess === 'registry_only') {
+                        return McpAccessValue.Registry;
+                    }
+                    return undefined;
+                },
             }
         },
         [mcpAutoStartConfig]: {
             type: 'string',
             description: ( localize(
-                4735,
+                4790,
                 "Controls whether MCP servers should be automatically started when the chat messages are submitted."
             )),
             default: McpAutoStartValue.Never,
@@ -365,10 +411,10 @@ configurationRegistry.registerConfiguration({
                 McpAutoStartValue.NewAndOutdated
             ],
             enumDescriptions: [
-                ( localize(4736, "Never automatically start MCP servers.")),
-                ( localize(4737, "Only automatically start new MCP servers that have never been run.")),
+                ( localize(4791, "Never automatically start MCP servers.")),
+                ( localize(4792, "Only automatically start new MCP servers that have never been run.")),
                 ( localize(
-                4738,
+                4793,
                 "Automatically start new and outdated MCP servers that are not yet running."
             ))
             ],
@@ -377,9 +423,9 @@ configurationRegistry.registerConfiguration({
         [mcpServerSamplingSection]: {
             type: 'object',
             description: ( localize(
-                4739,
+                4794,
                 "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(4740, 'List Servers'))
+                'MCP: ' + ( localize(4795, 'List Servers'))
             )),
             scope: ConfigurationScope.RESOURCE,
             additionalProperties: {
@@ -388,7 +434,7 @@ configurationRegistry.registerConfiguration({
                     allowedDuringChat: {
                         type: 'boolean',
                         description: ( localize(
-                            4741,
+                            4796,
                             "Whether this server is make sampling requests during its tool calls in a chat session."
                         )),
                         default: true,
@@ -396,7 +442,7 @@ configurationRegistry.registerConfiguration({
                     allowedOutsideChat: {
                         type: 'boolean',
                         description: ( localize(
-                            4742,
+                            4797,
                             "Whether this server is allowed to make sampling requests outside of a chat session."
                         )),
                         default: false,
@@ -405,7 +451,7 @@ configurationRegistry.registerConfiguration({
                         type: 'array',
                         items: {
                             type: 'string',
-                            description: ( localize(4743, "A model the MCP server has access to.")),
+                            description: ( localize(4798, "A model the MCP server has access to.")),
                         },
                     }
                 }
@@ -414,7 +460,7 @@ configurationRegistry.registerConfiguration({
         [AssistedTypes[AddConfigurationType.NuGetPackage].enabledConfigKey]: {
             type: 'boolean',
             description: ( localize(
-                4744,
+                4799,
                 "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,
@@ -426,7 +472,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.UseFileStorage]: {
             type: 'boolean',
             description: ( localize(
-                4745,
+                4800,
                 "Enables storing chat sessions on disk instead of in the storage service. Enabling this does a one-time per-workspace migration of existing sessions to the new format."
             )),
             default: true,
@@ -435,75 +481,65 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.Edits2Enabled]: {
             type: 'boolean',
             description: ( localize(
-                4746,
+                4801,
                 "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: true,
-            experiment: {
-                mode: 'startup'
-            }
+            default: false,
         },
         [ChatConfiguration.ExtensionToolsEnabled]: {
             type: 'boolean',
-            description: ( localize(4747, "Enable using tools contributed by third-party extensions.")),
+            description: ( localize(4802, "Enable using tools contributed by third-party extensions.")),
             default: true,
             policy: {
                 name: 'ChatAgentExtensionTools',
                 minimumVersion: '1.99',
-                description: ( localize(4748, "Enable using tools contributed by third-party extensions.")),
+                description: ( localize(4803, "Enable using tools contributed by third-party extensions.")),
             }
         },
         [ChatConfiguration.AgentEnabled]: {
             type: 'boolean',
             description: ( localize(
-                4749,
-                "Enable agent mode for {0}. When this is enabled, agent mode can be activated via the dropdown in the view.",
-                'Copilot Chat'
+                4804,
+                "Enable agent mode for chat. When this is enabled, agent mode can be activated via the dropdown in the view."
             )),
             default: true,
-            experiment: {
-                mode: 'startup'
-            },
             policy: {
                 name: 'ChatAgentMode',
                 minimumVersion: '1.99',
-                tags: [PolicyTag.Account, PolicyTag.Agent]
+                value: (account) => account.chat_agent_enabled === false ? false : undefined,
             }
         },
         [ChatConfiguration.EnableMath]: {
             type: 'boolean',
-            description: ( localize(4750, "Enable math rendering in chat responses using Katex.")),
-            default: false,
+            description: ( localize(4805, "Enable math rendering in chat responses using KaTeX.")),
+            default: true,
             tags: ['preview'],
         },
         [ChatConfiguration.AgentSessionsViewLocation]: {
             type: 'string',
-            enum: ['disabled', 'showChatsMenu', 'view'],
-            description: ( localize(4751, "Controls where to show the agent sessions menu.")),
+            enum: ['disabled', 'view'],
+            description: ( localize(4806, "Controls where to show the agent sessions menu.")),
             default: 'disabled',
             tags: ['experimental'],
+            experiment: {
+                mode: 'auto'
+            }
         },
         [mcpDiscoverySection]: {
-            oneOf: [
-                { type: 'boolean' },
-                {
-                    type: 'object',
-                    default: Object.fromEntries(( allDiscoverySources.map(k => [k, true]))),
-                    properties: Object.fromEntries(( allDiscoverySources.map(k => [
-                        k,
-                        { type: 'boolean', description: ( localize(4752, "Enables discovery of {0} servers", discoverySourceLabel[k])) }
-                    ]))),
-                }
-            ],
-            default: true,
+            type: 'object',
+            properties: Object.fromEntries(( allDiscoverySources.map(
+                k => [k, { type: 'boolean', description: discoverySourceSettingsLabel[k] }]
+            ))),
+            additionalProperties: false,
+            default: Object.fromEntries(( allDiscoverySources.map(k => [k, false]))),
             markdownDescription: ( localize(
-                4753,
-                "Configures discovery of Model Context Protocol servers on the machine. It may be set to `true` or `false` to disable or enable all sources, and an mapping sources you wish to enable."
+                4807,
+                "Configures discovery of Model Context Protocol servers from configuration from various other applications."
             )),
         },
         [mcpGalleryServiceUrlConfig]: {
             type: 'string',
-            description: ( localize(4754, "Configure the MCP Gallery service URL to connect to")),
+            description: ( localize(4808, "Configure the MCP Gallery service URL to connect to")),
             default: '',
             scope: ConfigurationScope.APPLICATION,
             tags: ['usesOnlineServices'],
@@ -511,13 +547,14 @@ configurationRegistry.registerConfiguration({
             policy: {
                 name: 'McpGalleryServiceUrl',
                 minimumVersion: '1.101',
+                value: (account) => account.mcpRegistryUrl
             },
         },
         [PromptsConfig.KEY]: {
             type: 'boolean',
-            title: ( localize(4755, "Prompt Files")),
+            title: ( localize(4809, "Prompt Files")),
             markdownDescription: ( localize(
-                4756,
+                4810,
                 "Enable reusable prompt (`*{0}`) and instruction files (`*{1}`) in Chat sessions. [Learn More]({2}).",
                 PROMPT_FILE_EXTENSION,
                 INSTRUCTION_FILE_EXTENSION,
@@ -530,14 +567,14 @@ configurationRegistry.registerConfiguration({
             policy: {
                 name: 'ChatPromptFiles',
                 minimumVersion: '1.99',
-                description: ( localize(4757, "Enables reusable prompt and instruction files in Chat sessions."))
+                description: ( localize(4811, "Enables reusable prompt and instruction files in Chat sessions."))
             }
         },
         [PromptsConfig.INSTRUCTIONS_LOCATION_KEY]: {
             type: 'object',
-            title: ( localize(4758, "Instructions File Locations")),
+            title: ( localize(4812, "Instructions File Locations")),
             markdownDescription: ( localize(
-                4759,
+                4813,
                 "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
@@ -560,9 +597,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.PROMPT_LOCATIONS_KEY]: {
             type: 'object',
-            title: ( localize(4760, "Prompt File Locations")),
+            title: ( localize(4814, "Prompt File Locations")),
             markdownDescription: ( localize(
-                4761,
+                4815,
                 "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
@@ -586,9 +623,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.MODE_LOCATION_KEY]: {
             type: 'object',
-            title: ( localize(4762, "Mode File Locations")),
+            title: ( localize(4816, "Mode File Locations")),
             markdownDescription: ( localize(
-                4763,
+                4817,
                 "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
@@ -610,10 +647,45 @@ configurationRegistry.registerConfiguration({
                 },
             ],
         },
+        [PromptsConfig.USE_AGENT_MD]: {
+            type: 'boolean',
+            title: ( localize(4818, "Use AGENTS.MD file")),
+            markdownDescription: ( localize(
+                4819,
+                "Controls whether instructions from `AGENTS.MD` file found in a workspace roots are added to all chat requests."
+            )),
+            default: true,
+            restricted: true,
+            disallowConfigurationDefault: true,
+            tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions']
+        },
+        [PromptsConfig.PROMPT_FILES_SUGGEST_KEY]: {
+            type: 'object',
+            title: ( localize(4820, "Prompt File Recommendations")),
+            markdownDescription: ( localize(
+                4821,
+                "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: {},
+            additionalProperties: {
+                oneOf: [
+                    { type: 'boolean' },
+                    { type: 'string' }
+                ]
+            },
+            tags: ['experimental'],
+            examples: [
+                {
+                    'plan': true,
+                    'a11y-audit': 'resourceExtname == .html',
+                    'document': 'resourceLangId == markdown'
+                }
+            ],
+        },
         'chat.setup.signInDialogVariant': {
             type: 'string',
-            enum: ['default', 'google'],
-            description: ( localize(4764, "Control variations of the sign-in dialog.")),
+            enum: ['default', 'apple'],
+            description: ( localize(4822, "Control variations of the sign-in dialog.")),
             default: 'default',
             tags: ['experimental'],
             experiment: {
@@ -624,26 +696,68 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: false,
             description: ( localize(
-                4765,
-                "Enables todo lists in chat. This tool allows you to use todo lists in chat."
+                4823,
+                "Enables todo lists in chat, which the agent uses as a tool for planning, progress tracking, and context management for complex development workflows."
             )),
             tags: ['experimental'],
             experiment: {
-                mode: 'startup'
+                mode: 'auto'
             }
         },
-        'chat.tools.useTreePicker': {
+        'chat.todoListTool.writeOnly': {
             type: 'boolean',
-            default: true,
+            default: false,
             description: ( localize(
-                4766,
-                "Use the new Quick Tree-based tools picker instead of the Quick Pick-based one. Provides better hierarchical organization of tools and tool sets with collapsible sections, improved visual hierarchy, and native tree interactions."
+                4824,
+                "When enabled, the todo tool operates in write-only mode, requiring the agent to remember todos in context."
+            )),
+            tags: ['experimental']
+        },
+        [ChatConfiguration.ThinkingStyle]: {
+            type: 'string',
+            default: 'collapsedPreview',
+            enum: ['collapsed', 'collapsedPreview', 'expanded', 'none'],
+            enumDescriptions: [
+                ( localize(4825, "Thinking parts will be collapsed by default.")),
+                ( localize(
+                4826,
+                "Thinking parts will be expanded first, then collapse once we reach a part that is not thinking."
             )),
+                ( localize(4827, "Thinking parts will be expanded by default.")),
+                ( localize(4828, "Do not show the thinking")),
+            ],
+            description: ( localize(4829, "Controls how thinking is rendered.")),
+            tags: ['experimental'],
+        },
+        'chat.disableAIFeatures': {
+            type: 'boolean',
+            description: ( localize(
+                4830,
+                "Disable and hide built-in AI features provided by GitHub Copilot, including chat, code completions and next edit suggestions."
+            )),
+            default: false,
+            scope: ConfigurationScope.WINDOW
+        },
+        [ChatConfiguration.UseChatSessionsForCloudButton]: {
+            type: 'boolean',
+            description: ( localize(
+                4831,
+                "Controls whether the 'Delegate to coding agent' button uses the new chat sessions API."
+            )),
+            default: false,
             tags: ['experimental'],
+        },
+        [ChatConfiguration.ShowAgentSessionsViewDescription]: {
+            type: 'boolean',
+            description: ( localize(
+                4832,
+                "Controls whether session descriptions are displayed on a second row in the Chat Sessions view."
+            )),
+            default: true,
         }
     }
 });
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4767, "Chat"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4833, "Chat"))), [
     ( new SyncDescriptor(ChatEditorInput))
 ]);
 ( Registry.as(Extensions$1.ConfigurationMigration)).registerConfigurationMigrations([
@@ -653,7 +767,16 @@ configurationRegistry.registerConfiguration({
             ['chat.experimental.detectParticipant.enabled', { value: undefined }],
             ['chat.detectParticipant.enabled', { value: value !== false }]
         ])
-    }
+    },
+    {
+        key: mcpDiscoverySection,
+        migrateFn: (value) => {
+            if (typeof value === 'boolean') {
+                return { value: Object.fromEntries(( allDiscoverySources.map(k => [k, value]))) };
+            }
+            return { value };
+        }
+    },
 ]);
 let ChatResolverContribution = class ChatResolverContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatResolver'; }
@@ -661,7 +784,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         super();
         this._register(editorResolverService.registerEditor(`{${Schemas.vscodeChatEditor},${Schemas.vscodeChatSession}}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localize(4767, "Chat")),
+            label: ( localize(4833, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
@@ -695,14 +818,14 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Di
                 const defaultValue = value ?? (this.entitlementService.entitlement === ChatEntitlement.Free ? 25 : 25);
                 const node = {
                     id: 'chatSidebar',
-                    title: ( localize(4703, "Chat")),
+                    title: ( localize(4752, "Chat")),
                     type: 'object',
                     properties: {
                         'chat.agent.maxRequests': {
                             type: 'number',
                             markdownDescription: ( localize(
-                                4768,
-                                "The maximum number of requests to allow Copilot to use per-turn in agent mode. When the limit is reached, Copilot will ask the user to confirm that it should continue."
+                                4834,
+                                "The maximum number of requests to allow per-turn in agent mode. When the limit is reached, will ask to confirm to continue."
                             )),
                             default: defaultValue,
                         },
@@ -731,7 +854,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
         super();
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'clear',
-            detail: ( localize(4769, "Start a new chat")),
+            detail: ( localize(4835, "Start a new chat")),
             sortText: 'z2_clear',
             executeImmediately: true,
             locations: [ChatAgentLocation.Panel]
@@ -740,7 +863,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: SAVE_TO_PROMPT_SLASH_COMMAND_NAME,
-            detail: ( localize(4770, "Save chat to a prompt file")),
+            detail: ( localize(4836, "Save chat to a prompt file")),
             sortText: `z3_${SAVE_TO_PROMPT_SLASH_COMMAND_NAME}`,
             executeImmediately: true,
             silent: true,
@@ -771,7 +894,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                 progress.report({ content: ( new MarkdownString('\n\n')), kind: 'markdownContent' });
             }
             const agentText = (await Promise.all(( agents
-                .filter(a => a.id !== defaultAgent?.id && !a.isCore)
+                .filter(a => !a.isDefault && !a.isCore)
                 .filter(a => a.locations.includes(ChatAgentLocation.Panel))
                 .map(async (a) => {
                 const description = a.description ? `- ${a.description}` : '';
@@ -784,22 +907,6 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                 return (agentLine + '\n' + commandText).trim();
             })))).join('\n');
             progress.report({ content: ( new MarkdownString(agentText, { isTrusted: { enabledCommands: [ChatSubmitAction.ID] } })), kind: 'markdownContent' });
-            if (defaultAgent?.metadata.helpTextVariablesPrefix) {
-                progress.report({ content: ( new MarkdownString('\n\n')), kind: 'markdownContent' });
-                if (isMarkdownString(defaultAgent.metadata.helpTextVariablesPrefix)) {
-                    progress.report({ content: defaultAgent.metadata.helpTextVariablesPrefix, kind: 'markdownContent' });
-                }
-                else {
-                    progress.report({ content: ( new MarkdownString(defaultAgent.metadata.helpTextVariablesPrefix)), kind: 'markdownContent' });
-                }
-                const variables = [
-                    { name: 'file', description: ( localize(4771, "Choose a file in the workspace")) }
-                ];
-                const variableText = ( variables
-                    .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`))
-                    .join('\n');
-                progress.report({ content: ( new MarkdownString('\n' + variableText)), kind: 'markdownContent' });
-            }
             if (defaultAgent?.metadata.helpTextPostfix) {
                 progress.report({ content: ( new MarkdownString('\n\n')), kind: 'markdownContent' });
                 if (isMarkdownString(defaultAgent.metadata.helpTextPostfix)) {
@@ -833,6 +940,7 @@ registerWorkbenchContribution2(ChatRelatedFilesContribution.ID, ChatRelatedFiles
 registerWorkbenchContribution2(ChatViewsWelcomeHandler.ID, ChatViewsWelcomeHandler, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(ChatGettingStartedContribution.ID, ChatGettingStartedContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(ChatSetupContribution.ID, ChatSetupContribution, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ChatTeardownContribution.ID, ChatTeardownContribution, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(ChatStatusBarEntry.ID, ChatStatusBarEntry, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(BuiltinToolsContribution.ID, BuiltinToolsContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(ChatAgentSettingContribution.ID, ChatAgentSettingContribution, WorkbenchPhase.AfterRestored);
@@ -845,7 +953,10 @@ registerWorkbenchContribution2(ChatContextContributions.ID, ChatContextContribut
 registerWorkbenchContribution2(ChatResponseResourceFileSystemProvider.ID, ChatResponseResourceFileSystemProvider, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(PromptUrlHandler.ID, PromptUrlHandler, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatSessionsView.ID, ChatSessionsView, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(UserToolSetsContributions.ID, UserToolSetsContributions, WorkbenchPhase.Eventually);
 registerChatActions();
+registerChatAccessibilityActions();
 registerChatCopyActions();
 registerChatCodeBlockActions();
 registerChatCodeCompareBlockActions();
@@ -862,8 +973,11 @@ registerChatEditorActions();
 registerChatToolActions();
 registerLanguageModelActions();
 registerEditorFeature(ChatPasteProvidersFeature);
-registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);
 registerPromptFileContributions();
-registerWorkbenchContribution2(UserToolSetsContributions.ID, UserToolSetsContributions, WorkbenchPhase.Eventually);
 registerAction2(ConfigureToolSets);
+registerAction2(RenameChatSessionAction);
+registerAction2(DeleteChatSessionAction);
+registerAction2(OpenChatSessionInNewEditorGroupAction);
+registerAction2(OpenChatSessionInSidebarAction);
+registerAction2(ToggleChatSessionsDescriptionDisplayAction);
 ChatWidget.CONTRIBS.push(ChatDynamicVariableModel);