@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

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

@@ -16,7 +16,7 @@ import { Extensions, ConfigurationScope } from '@codingame/monaco-vscode-api/vsc
 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, mcpGalleryServiceEnablementConfig, mcpAutoStartConfig, McpAutoStartValue, mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
+import { mcpGalleryServiceUrlConfig, mcpGalleryServiceEnablementConfig, mcpAppsEnabledConfig, mcpAutoStartConfig, McpAutoStartValue, mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-api/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-api/vscode/vs/workbench/browser/editor';
@@ -43,26 +43,25 @@ import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs
 import '../common/tools/chatTodoListService.js';
 import '../common/model/chatTransferService.js';
 import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService';
-import { ChatConfiguration, ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatConfiguration, AgentsControlClickBehavior, 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-api/vscode/vs/workbench/contrib/chat/common/languageModelStats';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { ChatPromptFilesExtensionPointHandler } from '../common/promptSyntax/chatPromptFilesContribution.js';
 import { PromptsConfig } from '@codingame/monaco-vscode-api/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-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { DEFAULT_SKILL_SOURCE_FOLDERS, SKILL_FILENAME, AGENTS_SOURCE_FOLDER, AGENT_FILE_EXTENSION, 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-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { PromptLanguageFeaturesProvider } from '../common/promptSyntax/promptFileContributions.js';
-import { AGENT_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { SKILL_DOCUMENTATION_URL, AGENT_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import '../common/promptSyntax/service/promptsServiceImpl.js';
-import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
+import { LanguageModelToolsExtensionPointHandler } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution';
 import { BuiltinToolsContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/builtinTools/tools';
 import '../common/voiceChatService.js';
 import { registerChatAccessibilityActions } from './actions/chatAccessibilityActions.js';
 import { PanelChatAccessibilityHelp, QuickChatAccessibilityHelp, EditsChatAccessibilityHelp, AgentChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
-import { ModeOpenChatGlobalAction, ACTION_ID_NEW_CHAT, CopilotTitleBarMenuRendering, registerChatActions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ModeOpenChatGlobalAction, ACTION_ID_NEW_CHAT, registerChatActions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { CodeBlockActionRendering, registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from './actions/chatCodeblockActions.js';
 import { ChatContextContributions } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/actions/chatContext';
 import { registerChatContextActions } from './actions/chatContextActions.js';
-import { ContinueChatInSessionActionRendering } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatContinueInAction';
 import { registerChatCopyActions } from './actions/chatCopyActions.js';
 import { registerChatDeveloperActions } from './actions/chatDeveloperActions.js';
 import { ChatSubmitAction, registerChatExecuteActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
@@ -79,7 +78,9 @@ import { registerChatTitleActions } from '@codingame/monaco-vscode-katex-common/
 import { registerChatElicitationActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatElicitationActions';
 import { registerChatToolActions } from './actions/chatToolActions.js';
 import { ChatTransferContribution } from './actions/chatTransfer.js';
+import { registerChatCustomizationDiagnosticsAction } from './actions/chatCustomizationDiagnosticsAction.js';
 import './agentSessions/agentSessions.contribution.js';
+import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import './accessibility/chatAccessibilityService.js';
 import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentModel';
@@ -92,15 +93,16 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { ChatInputBoxContentProvider } from './widget/input/editor/chatEditorInputContentProvider.js';
 import { ChatEditingEditorAccessibility } from './chatEditing/chatEditingEditorAccessibility.js';
-import { registerChatEditorActions } from './chatEditing/chatEditingEditorActions.js';
+import { registerChatEditorActions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions';
 import { ChatEditingEditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
-import { ChatEditingEditorOverlay } from './chatEditing/chatEditingEditorOverlay.js';
+import { ChatEditingEditorOverlay } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay';
 import './chatEditing/chatEditingServiceImpl.js';
 import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
 import { SimpleBrowserOverlay } from './attachments/simpleBrowserEditorOverlay.js';
 import { ChatEditor } from './widgetHosts/editor/chatEditor.js';
 import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 import './widget/chatLayoutService.js';
+import { ChatLanguageModelsDataContribution } from './languageModelsConfigurationService.js';
 import './chatManagement/chatManagement.contribution.js';
 import { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownDecorationsRenderer';
 import './chatOutputItemRenderer.js';
@@ -113,12 +115,11 @@ import { ChatSetupContribution, ChatTeardownContribution } from './chatSetup/cha
 import { ChatStatusBarEntry } from './chatStatus/chatStatusEntry.js';
 import './attachments/chatVariables.js';
 import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { ChatImplicitContextContribution } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatImplicitContext';
-import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions';
+import './widget/input/editor/chatInputCompletions.js';
 import './widget/input/editor/chatInputEditorContrib.js';
 import './widget/input/editor/chatInputEditorHover.js';
-import { ChatRelatedFilesContribution } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatInputRelatedFilesContrib';
 import './tools/languageModelToolsConfirmationService.js';
 import { globalAutoApproveDescription } from './tools/languageModelToolsService.js';
 import './promptSyntax/promptCodingAgentActionContribution.js';
@@ -128,415 +129,475 @@ import { UserToolSetsContributions, ConfigureToolSets } from './tools/toolSetsCo
 import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
 import './widget/chatWidgetService.js';
 import { ChatWindowNotifier } from './chatWindowNotifier.js';
+import { ChatRepoInfoContribution } from './chatRepoInfo.js';
+import { VALID_PROMPT_FOLDER_PATTERN } from '../common/promptSyntax/utils/promptFilesLocator.js';
+import './chatTipService.js';
+import '../../notebook/browser/controller/chat/notebook.chat.contribution.js';
 
 const toolReferenceNameEnumValues = [];
 const toolReferenceNameEnumDescriptions = [];
 const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
-    id: 'chatSidebar',
-    title: ( localize(4993, "Chat")),
-    type: 'object',
+    id: "chatSidebar",
+    title: ( localize(5122, "Chat")),
+    type: "object",
     properties: {
-        'chat.fontSize': {
-            type: 'number',
-            description: ( localize(4994, "Controls the font size in pixels in chat messages.")),
+        "chat.fontSize": {
+            type: "number",
+            description: ( localize(5123, "Controls the font size in pixels in chat messages.")),
             default: 13,
             minimum: 6,
             maximum: 100
         },
-        'chat.fontFamily': {
-            type: 'string',
-            description: ( localize(4995, "Controls the font family in chat messages.")),
-            default: 'default'
-        },
-        'chat.editor.fontSize': {
-            type: 'number',
-            description: ( localize(4996, "Controls the font size in pixels in chat codeblocks.")),
-            default: isMacintosh ? 12 : 14,
-        },
-        'chat.editor.fontFamily': {
-            type: 'string',
-            description: ( localize(4997, "Controls the font family in chat codeblocks.")),
-            default: 'default'
-        },
-        'chat.editor.fontWeight': {
-            type: 'string',
-            description: ( localize(4998, "Controls the font weight in chat codeblocks.")),
-            default: 'default'
-        },
-        'chat.editor.wordWrap': {
-            type: 'string',
-            description: ( localize(4999, "Controls whether lines should wrap in chat codeblocks.")),
-            default: 'off',
-            enum: ['on', 'off']
-        },
-        'chat.editor.lineHeight': {
-            type: 'number',
+        "chat.fontFamily": {
+            type: "string",
+            description: ( localize(5124, "Controls the font family in chat messages.")),
+            default: "default"
+        },
+        "chat.editor.fontSize": {
+            type: "number",
+            description: ( localize(5125, "Controls the font size in pixels in chat codeblocks.")),
+            default: isMacintosh ? 12 : 14
+        },
+        "chat.editor.fontFamily": {
+            type: "string",
+            description: ( localize(5126, "Controls the font family in chat codeblocks.")),
+            default: "default"
+        },
+        "chat.editor.fontWeight": {
+            type: "string",
+            description: ( localize(5127, "Controls the font weight in chat codeblocks.")),
+            default: "default"
+        },
+        "chat.editor.wordWrap": {
+            type: "string",
+            description: ( localize(5128, "Controls whether lines should wrap in chat codeblocks.")),
+            default: "off",
+            enum: ["on", "off"]
+        },
+        "chat.editor.lineHeight": {
+            type: "number",
             description: ( localize(
-                5000,
+                5129,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
         },
-        'chat.commandCenter.enabled': {
-            type: 'boolean',
+        [ChatConfiguration.AgentsControlClickBehavior]: {
+            type: "string",
+            enum: [
+                AgentsControlClickBehavior.Default,
+                AgentsControlClickBehavior.Cycle,
+                AgentsControlClickBehavior.Focus
+            ],
+            enumDescriptions: [( localize(5130, "Clicking chat icon toggles chat visibility.")), ( localize(
+                5131,
+                "Clicking chat icon cycles through: show chat, maximize chat, hide chat. This requires chat to be contained in the secondary sidebar."
+            )), ( localize(
+                5132,
+                "Clicking chat icon focuses the chat view and maximizes it if located in the secondary sidebar."
+            ))],
             markdownDescription: ( localize(
-                5001,
-                "Controls whether the command center shows a menu for actions to control chat (requires {0}).",
-                '`#window.commandCenter#`'
+                5133,
+                "Controls the behavior when clicking on the chat icon in the command center."
             )),
-            default: true
+            default: product.quality !== "stable" ? AgentsControlClickBehavior.Cycle : AgentsControlClickBehavior.Default,
+            tags: ["experimental"]
+        },
+        [ChatConfiguration.AgentStatusEnabled]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                5134,
+                "Controls whether the 'Agent Status' indicator is shown in the title bar command center. Enabling this setting will automatically enable {0}. The unread/in-progress session indicators require {1} to be enabled.",
+                "`#window.commandCenter#`",
+                "`#chat.viewSessions.enabled#`"
+            )),
+            default: true,
+            tags: ["experimental"]
+        },
+        [ChatConfiguration.UnifiedAgentsBar]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                5135,
+                "Replaces the command center search box with a unified chat and search widget."
+            )),
+            default: false,
+            tags: ["experimental"]
+        },
+        [ChatConfiguration.AgentSessionProjectionEnabled]: {
+            type: "boolean",
+            markdownDescription: ( localize(
+                5136,
+                "Controls whether Agent Session Projection mode is enabled for reviewing agent sessions in a focused workspace."
+            )),
+            default: false,
+            tags: ["experimental"]
         },
-        'chat.implicitContext.enabled': {
-            type: 'object',
+        "chat.implicitContext.enabled": {
+            type: "object",
             description: ( localize(
-                5002,
+                5137,
                 "Enables automatically using the active editor as chat context for specified chat locations."
             )),
             additionalProperties: {
-                type: 'string',
-                enum: ['never', 'first', 'always'],
-                description: ( localize(5003, "The value for the implicit context.")),
-                enumDescriptions: [
-                    ( localize(5004, "Implicit context is never enabled.")),
-                    ( localize(5005, "Implicit context is enabled for the first interaction.")),
-                    ( localize(5006, "Implicit context is always enabled."))
-                ]
+                type: "string",
+                enum: ["never", "first", "always"],
+                description: ( localize(5138, "The value for the implicit context.")),
+                enumDescriptions: [( localize(5139, "Implicit context is never enabled.")), ( localize(5140, "Implicit context is enabled for the first interaction.")), ( localize(5141, "Implicit context is always enabled."))]
             },
             default: {
-                'panel': 'always',
+                "panel": "always"
             }
         },
-        'chat.implicitContext.suggestedContext': {
-            type: 'boolean',
+        "chat.implicitContext.suggestedContext": {
+            type: "boolean",
             markdownDescription: ( localize(
-                5007,
+                5142,
                 "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,
+            default: true
         },
-        'chat.editing.autoAcceptDelay': {
-            type: 'number',
+        "chat.editing.autoAcceptDelay": {
+            type: "number",
             markdownDescription: ( localize(
-                5008,
+                5143,
                 "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,
             minimum: 0,
             maximum: 100
         },
-        'chat.editing.confirmEditRequestRemoval': {
-            type: 'boolean',
+        "chat.editing.confirmEditRequestRemoval": {
+            type: "boolean",
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                5009,
+                5144,
                 "Whether to show a confirmation before removing a request and its associated edits."
             )),
-            default: true,
+            default: true
         },
-        'chat.editing.confirmEditRequestRetry': {
-            type: 'boolean',
+        "chat.editing.confirmEditRequestRetry": {
+            type: "boolean",
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                5010,
+                5145,
                 "Whether to show a confirmation before retrying a request and its associated edits."
             )),
-            default: true,
+            default: true
+        },
+        "chat.editing.explainChanges.enabled": {
+            type: "boolean",
+            markdownDescription: ( localize(
+                5146,
+                "Controls whether the Explain button in the Chat panel and the Explain Changes context menu in the SCM view are shown. This is an experimental feature."
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
+        },
+        "chat.tips.enabled": {
+            type: "boolean",
+            description: ( localize(
+                5147,
+                "Controls whether tips are shown above user messages in chat. This is an experimental feature."
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
         },
-        'chat.experimental.detectParticipant.enabled': {
-            type: 'boolean',
+        "chat.experimental.detectParticipant.enabled": {
+            type: "boolean",
             deprecationMessage: ( localize(
-                5011,
+                5148,
                 "This setting is deprecated. Please use `chat.detectParticipant.enabled` instead."
             )),
-            description: ( localize(5012, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(5149, "Enables chat participant autodetection for panel chat.")),
             default: null
         },
-        'chat.detectParticipant.enabled': {
-            type: 'boolean',
-            description: ( localize(5013, "Enables chat participant autodetection for panel chat.")),
+        "chat.detectParticipant.enabled": {
+            type: "boolean",
+            description: ( localize(5150, "Enables chat participant autodetection for panel chat.")),
             default: true
         },
-        'chat.renderRelatedFiles': {
-            type: 'boolean',
+        [ChatConfiguration.InlineReferencesStyle]: {
+            type: "string",
+            enum: ["box", "link"],
+            enumDescriptions: [( localize(5151, "Display file and symbol references as boxed widgets with icons.")), ( localize(
+                5152,
+                "Display file and symbol references as simple blue links without icons."
+            ))],
             description: ( localize(
-                5014,
-                "Controls whether related files should be rendered in the chat input."
+                5153,
+                "Controls how file and symbol references are displayed in chat messages."
             )),
-            default: false
+            default: "box"
+        },
+        [ChatConfiguration.EditorAssociations]: {
+            type: "object",
+            markdownDescription: ( localize(
+                5154,
+                "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors for opening files from chat (for example `\"*.md\": \"vscode.markdown.preview.editor\"`)."
+            )),
+            additionalProperties: {
+                type: "string"
+            },
+            default: {}
         },
-        'chat.notifyWindowOnConfirmation': {
-            type: 'boolean',
+        "chat.notifyWindowOnConfirmation": {
+            type: "boolean",
             description: ( localize(
-                5015,
+                5155,
                 "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,
+            default: true
         },
         [ChatConfiguration.GlobalAutoApprove]: {
             default: false,
             markdownDescription: globalAutoApproveDescription.value,
-            type: 'boolean',
+            type: "boolean",
             scope: ConfigurationScope.APPLICATION_MACHINE,
-            tags: ['experimental'],
+            tags: ["experimental"],
             policy: {
-                name: 'ChatToolsAutoApprove',
+                name: "ChatToolsAutoApprove",
                 category: PolicyCategory.InteractiveSession,
-                minimumVersion: '1.99',
-                value: (account) => account.chat_preview_features_enabled === false ? false : undefined,
+                minimumVersion: "1.99",
+                value: policyData => policyData.chat_preview_features_enabled === false ? false : undefined,
                 localization: {
                     description: {
-                        key: 'autoApprove2.description',
+                        key: "autoApprove2.description",
                         value: ( localize(
-                            5016,
-                            '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.'
+                            5156,
+                            "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]: {
             default: {
-                '**/*': true,
-                '**/.vscode/*.json': false,
-                '**/.git/**': false,
-                '**/{package.json,package-lock.json,server.xml,build.rs,web.config,.gitattributes,.env}': false,
-                '**/*.{code-workspace,csproj,fsproj,vbproj,vcxproj,proj,targets,props}': false,
+                "**/*": true,
+                "**/.vscode/*.json": false,
+                "**/.git/**": false,
+                "**/{package.json,server.xml,build.rs,web.config,.gitattributes,.env}": false,
+                "**/*.{code-workspace,csproj,fsproj,vbproj,vcxproj,proj,targets,props}": false,
+                "**/*.lock": false,
+                "**/*-lock.{yaml,json}": false
             },
             markdownDescription: ( localize(
-                5017,
+                5157,
                 "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',
+            type: "object",
             additionalProperties: {
-                type: 'boolean',
+                type: "boolean"
             }
         },
         [ChatConfiguration.AutoApprovedUrls]: {
             default: {},
             markdownDescription: ( localize(
-                5018,
+                5158,
                 "Controls which URLs are automatically approved when requested by chat tools. Keys are URL patterns and values can be `true` to approve both requests and responses, `false` to deny, or an object with `approveRequest` and `approveResponse` properties for granular control.\n\nExamples:\n- `\"https://example.com\": true` - Approve all requests to example.com\n- `\"https://*.example.com\": true` - Approve all requests to any subdomain of example.com\n- `\"https://example.com/api/*\": { \"approveRequest\": true, \"approveResponse\": false }` - Approve requests but not responses for example.com/api paths"
             )),
-            type: 'object',
+            type: "object",
             additionalProperties: {
-                oneOf: [
-                    { type: 'boolean' },
-                    {
-                        type: 'object',
-                        properties: {
-                            approveRequest: { type: 'boolean' },
-                            approveResponse: { type: 'boolean' }
+                oneOf: [{
+                    type: "boolean"
+                }, {
+                    type: "object",
+                    properties: {
+                        approveRequest: {
+                            type: "boolean"
+                        },
+                        approveResponse: {
+                            type: "boolean"
                         }
                     }
-                ]
+                }]
             }
         },
         [ChatConfiguration.EligibleForAutoApproval]: {
             default: {},
             markdownDescription: ( localize(
-                5019,
-                'Controls which tools are eligible for automatic approval. Tools set to \'false\' will always present a confirmation and will never offer the option to auto-approve. The default behavior (or setting a tool to \'true\') may result in the tool offering auto-approval options.'
+                5159,
+                "Controls which tools are eligible for automatic approval. Tools set to 'false' will always present a confirmation and will never offer the option to auto-approve. The default behavior (or setting a tool to 'true') may result in the tool offering auto-approval options."
             )),
-            type: 'object',
+            type: "object",
             propertyNames: {
                 enum: toolReferenceNameEnumValues,
-                enumDescriptions: toolReferenceNameEnumDescriptions,
+                enumDescriptions: toolReferenceNameEnumDescriptions
             },
             additionalProperties: {
-                type: 'boolean',
+                type: "boolean"
             },
-            tags: ['experimental'],
-            examples: [
-                {
-                    'fetch': false,
-                    'runTask': false
-                }
-            ],
+            examples: [{
+                "fetch": false,
+                "runTask": false
+            }],
             policy: {
-                name: 'ChatToolsEligibleForAutoApproval',
+                name: "ChatToolsEligibleForAutoApproval",
                 category: PolicyCategory.InteractiveSession,
-                minimumVersion: '1.107',
+                minimumVersion: "1.107",
                 localization: {
                     description: {
-                        key: 'chat.tools.eligibleForAutoApproval',
+                        key: "chat.tools.eligibleForAutoApproval",
                         value: ( localize(
-                            5019,
-                            'Controls which tools are eligible for automatic approval. Tools set to \'false\' will always present a confirmation and will never offer the option to auto-approve. The default behavior (or setting a tool to \'true\') may result in the tool offering auto-approval options.'
+                            5159,
+                            "Controls which tools are eligible for automatic approval. Tools set to 'false' will always present a confirmation and will never offer the option to auto-approve. The default behavior (or setting a tool to 'true') may result in the tool offering auto-approval options."
                         ))
                     }
-                },
+                }
             }
         },
-        [ChatConfiguration.SuspendThrottling]: {
-            type: 'boolean',
-            description: ( localize(
-                5020,
-                "Controls whether background throttling is suspended when a chat request is in progress, allowing the chat session to continue even when the window is not in focus."
-            )),
-            default: true,
-            tags: ['preview']
-        },
-        'chat.sendElementsToChat.enabled': {
+        "chat.sendElementsToChat.enabled": {
             default: true,
             description: ( localize(
-                5021,
+                5160,
                 "Controls whether elements can be sent to chat from the Simple Browser."
             )),
-            type: 'boolean',
-            tags: ['preview']
+            type: "boolean",
+            tags: ["preview"]
         },
-        'chat.sendElementsToChat.attachCSS': {
+        "chat.sendElementsToChat.attachCSS": {
             default: true,
             markdownDescription: ( localize(
-                5022,
+                5161,
                 "Controls whether CSS of the selected element will be added to the chat. {0} must be enabled.",
-                '`#chat.sendElementsToChat.enabled#`'
+                "`#chat.sendElementsToChat.enabled#`"
             )),
-            type: 'boolean',
-            tags: ['preview']
+            type: "boolean",
+            tags: ["preview"]
         },
-        'chat.sendElementsToChat.attachImages': {
+        "chat.sendElementsToChat.attachImages": {
             default: true,
             markdownDescription: ( localize(
-                5023,
+                5162,
                 "Controls whether a screenshot of the selected element will be added to the chat. {0} must be enabled.",
-                '`#chat.sendElementsToChat.enabled#`'
+                "`#chat.sendElementsToChat.enabled#`"
             )),
-            type: 'boolean',
-            tags: ['experimental']
+            type: "boolean",
+            tags: ["experimental"]
         },
-        'chat.undoRequests.restoreInput': {
+        "chat.undoRequests.restoreInput": {
             default: true,
             markdownDescription: ( localize(
-                5024,
+                5163,
                 "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',
+            type: "boolean"
         },
-        'chat.editRequests': {
+        "chat.editRequests": {
             markdownDescription: ( localize(
-                5025,
+                5164,
                 "Enables editing of requests in the chat. This allows you to change the request content and resubmit it to the model."
             )),
-            type: 'string',
-            enum: ['inline', 'hover', 'input', 'none'],
-            default: 'inline',
-        },
-        [ChatConfiguration.ChatViewWelcomeEnabled]: {
-            type: 'boolean',
-            default: true,
-            description: ( localize(5026, "Show welcome banner when chat is empty.")),
+            type: "string",
+            enum: ["inline", "hover", "input", "none"],
+            default: "inline"
         },
         [ChatConfiguration.ChatViewSessionsEnabled]: {
-            type: 'boolean',
+            type: "boolean",
             default: true,
             description: ( localize(
-                5027,
+                5165,
                 "Show chat agent sessions when chat is empty or to the side when chat view is wide enough."
-            )),
+            ))
         },
         [ChatConfiguration.ChatViewSessionsOrientation]: {
-            type: 'string',
-            enum: ['stacked', 'sideBySide'],
-            enumDescriptions: [
-                ( localize(
-                5028,
+            type: "string",
+            enum: ["stacked", "sideBySide"],
+            enumDescriptions: [( localize(
+                5166,
                 "Display chat sessions vertically stacked above the chat input unless a chat session is visible."
-            )),
-                ( localize(
-                5029,
+            )), ( localize(
+                5167,
                 "Display chat sessions side by side if space is sufficient, otherwise fallback to stacked above the chat input unless a chat session is visible."
-            ))
-            ],
-            default: 'sideBySide',
+            ))],
+            default: "sideBySide",
             description: ( localize(
-                5030,
+                5168,
                 "Controls the orientation of the chat agent sessions view when it is shown alongside the chat."
-            )),
+            ))
         },
-        [ChatConfiguration.ChatViewTitleEnabled]: {
-            type: 'boolean',
-            default: true,
-            description: ( localize(5031, "Show the title of the chat above the chat in the chat view.")),
+        [ChatConfiguration.ChatViewProgressBadgeEnabled]: {
+            type: "boolean",
+            default: false,
+            description: ( localize(
+                5169,
+                "Show a progress badge on the chat view when an agent session is in progress that is opened in that view."
+            ))
         },
         [ChatConfiguration.NotifyWindowOnResponseReceived]: {
-            type: 'boolean',
+            type: "boolean",
             default: true,
             description: ( localize(
-                5032,
+                5170,
                 "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."
-            )),
+            ))
         },
-        'chat.checkpoints.enabled': {
-            type: 'boolean',
+        "chat.checkpoints.enabled": {
+            type: "boolean",
             default: true,
             description: ( localize(
-                5033,
+                5171,
                 "Enables checkpoints in chat. Checkpoints allow you to restore the chat to a previous state."
-            )),
+            ))
         },
-        'chat.checkpoints.showFileChanges': {
-            type: 'boolean',
-            description: ( localize(5034, "Controls whether to show chat checkpoint file changes.")),
+        "chat.checkpoints.showFileChanges": {
+            type: "boolean",
+            description: ( localize(5172, "Controls whether to show chat checkpoint file changes.")),
             default: false
         },
         [mcpAccessConfig]: {
-            type: 'string',
-            description: ( localize(5035, "Controls access to installed Model Context Protocol servers.")),
-            enum: [
-                McpAccessValue.None,
-                McpAccessValue.Registry,
-                McpAccessValue.All
-            ],
-            enumDescriptions: [
-                ( localize(5036, "No access to MCP servers.")),
-                ( localize(
-                5037,
+            type: "string",
+            description: ( localize(5173, "Controls access to installed Model Context Protocol servers.")),
+            enum: [McpAccessValue.None, McpAccessValue.Registry, McpAccessValue.All],
+            enumDescriptions: [( localize(5174, "No access to MCP servers.")), ( localize(
+                5175,
                 "Allows access to MCP servers installed from the registry that VS Code is connected to."
-            )),
-                ( localize(5038, "Allow access to any installed MCP server."))
-            ],
+            )), ( localize(5176, "Allow access to any installed MCP server."))],
             default: McpAccessValue.All,
             policy: {
-                name: 'ChatMCP',
+                name: "ChatMCP",
                 category: PolicyCategory.InteractiveSession,
-                minimumVersion: '1.99',
-                value: (account) => {
-                    if (account.mcp === false) {
+                minimumVersion: "1.99",
+                value: policyData => {
+                    if (policyData.mcp === false) {
                         return McpAccessValue.None;
                     }
-                    if (account.mcpAccess === 'registry_only') {
+                    if (policyData.mcpAccess === "registry_only") {
                         return McpAccessValue.Registry;
                     }
                     return undefined;
                 },
                 localization: {
                     description: {
-                        key: 'chat.mcp.access',
-                        value: ( localize(5035, "Controls access to installed Model Context Protocol servers."))
+                        key: "chat.mcp.access",
+                        value: ( localize(5173, "Controls access to installed Model Context Protocol servers."))
                     },
-                    enumDescriptions: [
-                        {
-                            key: 'chat.mcp.access.none', value: ( localize(5036, "No access to MCP servers.")),
-                        },
-                        {
-                            key: 'chat.mcp.access.registry', value: ( localize(
-                            5037,
+                    enumDescriptions: [{
+                        key: "chat.mcp.access.none",
+                        value: ( localize(5174, "No access to MCP servers."))
+                    }, {
+                        key: "chat.mcp.access.registry",
+                        value: ( localize(
+                            5175,
                             "Allows access to MCP servers installed from the registry that VS Code is connected to."
-                        )),
-                        },
-                        {
-                            key: 'chat.mcp.access.any', value: ( localize(5038, "Allow access to any installed MCP server."))
-                        }
-                    ]
-                },
+                        ))
+                    }, {
+                        key: "chat.mcp.access.any",
+                        value: ( localize(5176, "Allow access to any installed MCP server."))
+                    }]
+                }
             }
         },
         [mcpAutoStartConfig]: {
-            type: 'string',
+            type: "string",
             description: ( localize(
-                5039,
+                5177,
                 "Controls whether MCP servers should be automatically started when the chat messages are submitted."
             )),
             default: McpAutoStartValue.NewAndOutdated,
@@ -545,500 +606,650 @@ configurationRegistry.registerConfiguration({
                 McpAutoStartValue.OnlyNew,
                 McpAutoStartValue.NewAndOutdated
             ],
-            enumDescriptions: [
-                ( localize(5040, "Never automatically start MCP servers.")),
-                ( localize(5041, "Only automatically start new MCP servers that have never been run.")),
-                ( localize(
-                5042,
+            enumDescriptions: [( localize(5178, "Never automatically start MCP servers.")), ( localize(5179, "Only automatically start new MCP servers that have never been run.")), ( localize(
+                5180,
                 "Automatically start new and outdated MCP servers that are not yet running."
-            ))
-            ],
-            tags: ['experimental'],
+            ))],
+            tags: ["experimental"]
+        },
+        [mcpAppsEnabledConfig]: {
+            type: "boolean",
+            description: ( localize(
+                5181,
+                "Controls whether MCP servers can provide custom UI for tool invocations."
+            )),
+            default: true,
+            tags: ["experimental"]
         },
         [mcpServerSamplingSection]: {
-            type: 'object',
+            type: "object",
             description: ( localize(
-                5043,
+                5182,
                 "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(5044, 'List Servers'))
+                "MCP: " + ( localize(5183, "List Servers"))
             )),
             scope: ConfigurationScope.RESOURCE,
             additionalProperties: {
-                type: 'object',
+                type: "object",
                 properties: {
                     allowedDuringChat: {
-                        type: 'boolean',
+                        type: "boolean",
                         description: ( localize(
-                            5045,
+                            5184,
                             "Whether this server is make sampling requests during its tool calls in a chat session."
                         )),
-                        default: true,
+                        default: true
                     },
                     allowedOutsideChat: {
-                        type: 'boolean',
+                        type: "boolean",
                         description: ( localize(
-                            5046,
+                            5185,
                             "Whether this server is allowed to make sampling requests outside of a chat session."
                         )),
-                        default: false,
+                        default: false
                     },
                     allowedModels: {
-                        type: 'array',
+                        type: "array",
                         items: {
-                            type: 'string',
-                            description: ( localize(5047, "A model the MCP server has access to.")),
-                        },
+                            type: "string",
+                            description: ( localize(5186, "A model the MCP server has access to."))
+                        }
                     }
                 }
-            },
+            }
         },
         [AssistedTypes[AddConfigurationType.NuGetPackage].enabledConfigKey]: {
-            type: 'boolean',
+            type: "boolean",
             description: ( localize(
-                5048,
+                5187,
                 "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,
-            tags: ['experimental'],
+            tags: ["experimental"],
             experiment: {
-                mode: 'startup'
+                mode: "startup"
             }
         },
         [ChatConfiguration.Edits2Enabled]: {
-            type: 'boolean',
+            type: "boolean",
             description: ( localize(
-                5049,
+                5188,
                 "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,
+            default: false
         },
         [ChatConfiguration.ExtensionToolsEnabled]: {
-            type: 'boolean',
-            description: ( localize(5050, "Enable using tools contributed by third-party extensions.")),
+            type: "boolean",
+            description: ( localize(5189, "Enable using tools contributed by third-party extensions.")),
             default: true,
             policy: {
-                name: 'ChatAgentExtensionTools',
+                name: "ChatAgentExtensionTools",
                 category: PolicyCategory.InteractiveSession,
-                minimumVersion: '1.99',
+                minimumVersion: "1.99",
                 localization: {
                     description: {
-                        key: 'chat.extensionToolsEnabled',
-                        value: ( localize(5050, "Enable using tools contributed by third-party extensions."))
+                        key: "chat.extensionToolsEnabled",
+                        value: ( localize(5189, "Enable using tools contributed by third-party extensions."))
                     }
-                },
+                }
             }
         },
         [ChatConfiguration.AgentEnabled]: {
-            type: 'boolean',
+            type: "boolean",
             description: ( localize(
-                5051,
+                5190,
                 "When enabled, agent mode can be activated from chat and tools in agentic contexts with side effects can be used."
             )),
             default: true,
             policy: {
-                name: 'ChatAgentMode',
+                name: "ChatAgentMode",
                 category: PolicyCategory.InteractiveSession,
-                minimumVersion: '1.99',
-                value: (account) => account.chat_agent_enabled === false ? false : undefined,
+                minimumVersion: "1.99",
+                value: policyData => policyData.chat_agent_enabled === false ? false : undefined,
                 localization: {
                     description: {
-                        key: 'chat.agent.enabled.description',
+                        key: "chat.agent.enabled.description",
                         value: ( localize(
-                            5051,
+                            5190,
                             "When enabled, agent mode can be activated from chat and tools in agentic contexts with side effects can be used."
-                        )),
+                        ))
                     }
                 }
             }
         },
+        [ChatConfiguration.EditModeHidden]: {
+            type: "boolean",
+            description: ( localize(5191, "When enabled, hides the Edit mode from the chat mode picker.")),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
+        },
+        [ChatConfiguration.AlternativeToolAction]: {
+            type: "boolean",
+            description: ( localize(
+                5192,
+                "When enabled, shows the Configure Tools action in the mode picker dropdown on hover instead of in the chat input."
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
+        },
         [ChatConfiguration.EnableMath]: {
-            type: 'boolean',
-            description: ( localize(5052, "Enable math rendering in chat responses using KaTeX.")),
-            default: true,
-            tags: ['preview'],
+            type: "boolean",
+            description: ( localize(5193, "Enable math rendering in chat responses using KaTeX.")),
+            default: true
         },
         [ChatConfiguration.ShowCodeBlockProgressAnimation]: {
-            type: 'boolean',
+            type: "boolean",
             description: ( localize(
-                5053,
+                5194,
                 "When applying edits, show a progress animation in the code block pill. If disabled, shows the progress percentage instead."
             )),
             default: true,
-            tags: ['experimental'],
-        },
-        ['chat.statusWidget.sku']: {
-            type: 'string',
-            enum: ['free', 'anonymous'],
-            enumDescriptions: [
-                ( localize(5054, "Show status widget for free tier users.")),
-                ( localize(5055, "Show status widget for anonymous users."))
-            ],
+            tags: ["experimental"]
+        },
+        ["chat.statusWidget.sku"]: {
+            type: "string",
+            enum: ["free", "anonymous"],
+            enumDescriptions: [( localize(5195, "Show status widget for free tier users.")), ( localize(5196, "Show status widget for anonymous users."))],
             description: ( localize(
-                5056,
+                5197,
                 "Controls which user type should see the status widget in new chat sessions when quota is exceeded."
             )),
             default: undefined,
-            tags: ['experimental', 'advanced'],
+            tags: ["experimental", "advanced"],
             experiment: {
-                mode: 'auto'
+                mode: "auto"
             }
         },
         [mcpDiscoverySection]: {
-            type: 'object',
-            properties: Object.fromEntries(( allDiscoverySources.map(
-                k => [k, { type: 'boolean', description: discoverySourceSettingsLabel[k] }]
-            ))),
+            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(
-                5057,
+                5198,
                 "Configures discovery of Model Context Protocol servers from configuration from various other applications."
-            )),
+            ))
         },
         [mcpGalleryServiceEnablementConfig]: {
-            type: 'boolean',
+            type: "boolean",
             default: false,
-            tags: ['preview'],
+            tags: ["preview"],
             description: ( localize(
-                5058,
+                5199,
                 "Enables the default Marketplace for Model Context Protocol (MCP) servers."
             )),
-            included: product.quality === 'stable'
+            included: product.quality === "stable"
         },
         [mcpGalleryServiceUrlConfig]: {
-            type: 'string',
-            description: ( localize(5059, "Configure the MCP Gallery service URL to connect to")),
-            default: '',
+            type: "string",
+            description: ( localize(5200, "Configure the MCP Gallery service URL to connect to")),
+            default: "",
             scope: ConfigurationScope.APPLICATION,
-            tags: ['usesOnlineServices', 'advanced'],
+            tags: ["usesOnlineServices", "advanced"],
             included: false,
             policy: {
-                name: 'McpGalleryServiceUrl',
+                name: "McpGalleryServiceUrl",
                 category: PolicyCategory.InteractiveSession,
-                minimumVersion: '1.101',
-                value: (account) => account.mcpRegistryUrl,
+                minimumVersion: "1.101",
+                value: policyData => policyData.mcpRegistryUrl,
                 localization: {
                     description: {
-                        key: 'mcp.gallery.serviceUrl',
-                        value: ( localize(5059, "Configure the MCP Gallery service URL to connect to")),
+                        key: "mcp.gallery.serviceUrl",
+                        value: ( localize(5200, "Configure the MCP Gallery service URL to connect to"))
                     }
                 }
-            },
+            }
         },
         [PromptsConfig.INSTRUCTIONS_LOCATION_KEY]: {
-            type: 'object',
-            title: ( localize(5060, "Instructions File Locations")),
+            type: "object",
+            title: ( localize(5201, "Instructions File Locations")),
             markdownDescription: ( localize(
-                5061,
+                5202,
                 "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
             )),
             default: {
-                [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true,
+                [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true
+            },
+            additionalProperties: {
+                type: "boolean"
+            },
+            propertyNames: {
+                pattern: VALID_PROMPT_FOLDER_PATTERN,
+                patternErrorMessage: ( localize(
+                    5203,
+                    "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported. Glob patterns are deprecated and will be removed in future versions."
+                ))
             },
-            additionalProperties: { type: 'boolean' },
             restricted: true,
-            tags: ['prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
-            examples: [
-                {
-                    [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true,
-                },
-                {
-                    [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true,
-                    '/Users/vscode/repos/instructions': true,
-                },
-            ],
+            tags: ["prompts", "reusable prompts", "prompt snippets", "instructions"],
+            examples: [{
+                [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true
+            }, {
+                [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true,
+                "/Users/vscode/repos/instructions": true
+            }]
         },
         [PromptsConfig.PROMPT_LOCATIONS_KEY]: {
-            type: 'object',
-            title: ( localize(5062, "Prompt File Locations")),
+            type: "object",
+            title: ( localize(5204, "Prompt File Locations")),
             markdownDescription: ( localize(
-                5063,
+                5205,
                 "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
             )),
             default: {
-                [PROMPT_DEFAULT_SOURCE_FOLDER]: true,
+                [PROMPT_DEFAULT_SOURCE_FOLDER]: true
+            },
+            additionalProperties: {
+                type: "boolean"
+            },
+            unevaluatedProperties: {
+                type: "boolean"
+            },
+            propertyNames: {
+                pattern: VALID_PROMPT_FOLDER_PATTERN,
+                patternErrorMessage: ( localize(
+                    5206,
+                    "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported. Glob patterns are deprecated and will be removed in future versions."
+                ))
             },
-            additionalProperties: { type: 'boolean' },
-            unevaluatedProperties: { type: 'boolean' },
             restricted: true,
-            tags: ['prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
-            examples: [
-                {
-                    [PROMPT_DEFAULT_SOURCE_FOLDER]: true,
-                },
-                {
-                    [PROMPT_DEFAULT_SOURCE_FOLDER]: true,
-                    '/Users/vscode/repos/prompts': true,
-                },
-            ],
+            tags: ["prompts", "reusable prompts", "prompt snippets", "instructions"],
+            examples: [{
+                [PROMPT_DEFAULT_SOURCE_FOLDER]: true
+            }, {
+                [PROMPT_DEFAULT_SOURCE_FOLDER]: true,
+                "/Users/vscode/repos/prompts": true
+            }]
         },
         [PromptsConfig.MODE_LOCATION_KEY]: {
-            type: 'object',
-            title: ( localize(5064, "Mode File Locations")),
+            type: "object",
+            title: ( localize(5207, "Mode File Locations")),
             markdownDescription: ( localize(
-                5065,
+                5208,
                 "Specify location(s) of custom chat mode files (`*{0}`). [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
                 LEGACY_MODE_FILE_EXTENSION,
                 AGENT_DOCUMENTATION_URL
             )),
             default: {
-                [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true,
+                [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true
             },
             deprecationMessage: ( localize(
-                5066,
+                5209,
                 "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' },
+            additionalProperties: {
+                type: "boolean"
+            },
+            unevaluatedProperties: {
+                type: "boolean"
+            },
             restricted: true,
-            tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
-            examples: [
-                {
-                    [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true,
-                },
-                {
-                    [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true,
-                    '/Users/vscode/repos/chatmodes': true,
-                },
+            tags: [
+                "experimental",
+                "prompts",
+                "reusable prompts",
+                "prompt snippets",
+                "instructions"
             ],
+            examples: [{
+                [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true
+            }, {
+                [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true,
+                "/Users/vscode/repos/chatmodes": true
+            }]
+        },
+        [PromptsConfig.AGENTS_LOCATION_KEY]: {
+            type: "object",
+            title: ( localize(5210, "Agent File Locations")),
+            markdownDescription: ( localize(
+                5211,
+                "Specify location(s) of custom agent files (`*{0}`). [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
+                AGENT_FILE_EXTENSION,
+                AGENT_DOCUMENTATION_URL
+            )),
+            default: {
+                [AGENTS_SOURCE_FOLDER]: true
+            },
+            additionalProperties: {
+                type: "boolean"
+            },
+            propertyNames: {
+                pattern: VALID_PROMPT_FOLDER_PATTERN,
+                patternErrorMessage: ( localize(
+                    5212,
+                    "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported."
+                ))
+            },
+            restricted: true,
+            tags: ["prompts", "reusable prompts", "prompt snippets", "instructions"],
+            examples: [{
+                [AGENTS_SOURCE_FOLDER]: true
+            }, {
+                [AGENTS_SOURCE_FOLDER]: true,
+                "my-agents": true,
+                "../shared-agents": true,
+                "~/.copilot/agents": true
+            }]
         },
         [PromptsConfig.USE_AGENT_MD]: {
-            type: 'boolean',
-            title: ( localize(5067, "Use AGENTS.md file")),
+            type: "boolean",
+            title: ( localize(5213, "Use AGENTS.md file")),
             markdownDescription: ( localize(
-                5068,
+                5214,
                 "Controls whether instructions from `AGENTS.md` file found in a workspace roots are attached to all chat requests."
             )),
             default: true,
             restricted: true,
             disallowConfigurationDefault: true,
-            tags: ['prompts', 'reusable prompts', 'prompt snippets', 'instructions']
+            tags: ["prompts", "reusable prompts", "prompt snippets", "instructions"]
         },
         [PromptsConfig.USE_NESTED_AGENT_MD]: {
-            type: 'boolean',
-            title: ( localize(5069, "Use nested AGENTS.md files")),
+            type: "boolean",
+            title: ( localize(5215, "Use nested AGENTS.md files")),
             markdownDescription: ( localize(
-                5070,
+                5216,
                 "Controls whether instructions from nested `AGENTS.md` files found in the workspace are listed in all chat requests. The language model can load these skills on-demand if the `read` tool is available."
             )),
             default: false,
             restricted: true,
             disallowConfigurationDefault: true,
-            tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions']
+            tags: [
+                "experimental",
+                "prompts",
+                "reusable prompts",
+                "prompt snippets",
+                "instructions"
+            ]
         },
         [PromptsConfig.USE_AGENT_SKILLS]: {
-            type: 'boolean',
-            title: ( localize(5071, "Use Agent skills")),
+            type: "boolean",
+            title: ( localize(5217, "Use Agent skills")),
+            markdownDescription: ( localize(
+                5218,
+                "Controls whether skills are provided as specialized capabilities to the chat requests. Skills are loaded from the folders configured in `#chat.agentSkillsLocations#`. The language model can load these skills on-demand if the `read` tool is available. Learn more about [Agent Skills](https://aka.ms/vscode-agent-skills)."
+            )),
+            default: true,
+            restricted: true,
+            disallowConfigurationDefault: true,
+            tags: ["prompts", "reusable prompts", "prompt snippets", "instructions"]
+        },
+        [PromptsConfig.USE_SKILL_ADHERENCE_PROMPT]: {
+            type: "boolean",
+            title: ( localize(5219, "Use Skill Adherence Prompt")),
             markdownDescription: ( localize(
-                5072,
-                "Controls whether skills are provided as specialized capabilities to the chat requests. Skills are loaded from `.github/skills`, `~/.copilot/skills`, `.claude/skills`, and `~/.claude/skills`. The language model can load these skills on-demand if the `read` tool is available. Learn more about [Agent Skills](https://aka.ms/vscode-agent-skills)."
+                5220,
+                "Controls whether a stronger skill adherence prompt is used that encourages the model to immediately invoke skills when relevant rather than just announcing them."
             )),
             default: false,
             restricted: true,
             disallowConfigurationDefault: true,
-            tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions']
+            tags: [
+                "experimental",
+                "prompts",
+                "reusable prompts",
+                "prompt snippets",
+                "instructions"
+            ],
+            experiment: {
+                mode: "auto"
+            }
+        },
+        [PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS]: {
+            type: "boolean",
+            title: ( localize(5221, "Include Applying Instructions")),
+            markdownDescription: ( localize(
+                5222,
+                "Controls whether instructions with a matching 'applyTo' attribute are automatically included in chat requests."
+            )),
+            default: true,
+            restricted: true,
+            disallowConfigurationDefault: true,
+            tags: ["prompts", "reusable prompts", "prompt snippets", "instructions"]
+        },
+        [PromptsConfig.INCLUDE_REFERENCED_INSTRUCTIONS]: {
+            type: "boolean",
+            title: ( localize(5223, "Include Referenced Instructions")),
+            markdownDescription: ( localize(
+                5224,
+                "Controls whether referenced instructions are automatically included in chat requests."
+            )),
+            default: false,
+            restricted: true,
+            disallowConfigurationDefault: true,
+            tags: ["prompts", "reusable prompts", "prompt snippets", "instructions"]
+        },
+        [PromptsConfig.SKILLS_LOCATION_KEY]: {
+            type: "object",
+            title: ( localize(5225, "Agent Skills Locations")),
+            markdownDescription: ( localize(
+                5226,
+                "Specify location(s) of agent skills (`{0}`) that can be used in Chat Sessions. [Learn More]({1}).\n\nEach path should contain skill subfolders with SKILL.md files (e.g., add `my-skills` if you have `my-skills/skillA/SKILL.md`). Relative paths are resolved from the root folder(s) of your workspace.",
+                SKILL_FILENAME,
+                SKILL_DOCUMENTATION_URL
+            )),
+            default: {
+                ...( DEFAULT_SKILL_SOURCE_FOLDERS.map(folder => ({
+                    [folder.path]: true
+                }))).reduce((acc, curr) => ({
+                    ...acc,
+                    ...curr
+                }), {})
+            },
+            additionalProperties: {
+                type: "boolean"
+            },
+            propertyNames: {
+                pattern: VALID_PROMPT_FOLDER_PATTERN,
+                patternErrorMessage: ( localize(
+                    5227,
+                    "Paths must be relative or start with '~/'. Absolute paths and '\\' separators are not supported."
+                ))
+            },
+            restricted: true,
+            tags: ["prompts", "reusable prompts", "prompt snippets", "instructions"],
+            examples: [{
+                [DEFAULT_SKILL_SOURCE_FOLDERS[0].path]: true
+            }, {
+                [DEFAULT_SKILL_SOURCE_FOLDERS[0].path]: true,
+                "my-skills": true,
+                "../shared-skills": true,
+                "~/.custom/skills": true
+            }]
         },
         [PromptsConfig.PROMPT_FILES_SUGGEST_KEY]: {
-            type: 'object',
+            type: "object",
             scope: ConfigurationScope.RESOURCE,
-            title: ( localize(5073, "Prompt File Recommendations")),
+            title: ( localize(5228, "Prompt File Recommendations")),
             markdownDescription: ( localize(
-                5074,
+                5229,
                 "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' }
-                ]
+                oneOf: [{
+                    type: "boolean"
+                }, {
+                    type: "string"
+                }]
             },
-            tags: ['prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
-            examples: [
-                {
-                    'plan': true,
-                    'a11y-audit': 'resourceExtname == .html',
-                    'document': 'resourceLangId == markdown'
-                }
-            ],
+            tags: ["prompts", "reusable prompts", "prompt snippets", "instructions"],
+            examples: [{
+                "plan": true,
+                "a11y-audit": "resourceExtname == .html",
+                "document": "resourceLangId == markdown"
+            }]
         },
         [ChatConfiguration.TodosShowWidget]: {
-            type: 'boolean',
+            type: "boolean",
             default: true,
             description: ( localize(
-                5075,
+                5230,
                 "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'
-            }
-        },
-        'chat.todoListTool.writeOnly': {
-            type: 'boolean',
-            default: false,
-            description: ( localize(
-                5076,
-                "When enabled, the todo tool operates in write-only mode, requiring the agent to remember todos in context."
-            )),
-            tags: ['experimental'],
-            experiment: {
-                mode: 'auto'
-            }
-        },
-        'chat.todoListTool.descriptionField': {
-            type: 'boolean',
-            default: true,
-            description: ( localize(
-                5077,
-                "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'],
-            experiment: {
-                mode: 'auto'
-            }
+            ))
         },
         [ChatConfiguration.ThinkingStyle]: {
-            type: 'string',
-            default: 'fixedScrolling',
-            enum: ['collapsed', 'collapsedPreview', 'fixedScrolling'],
-            enumDescriptions: [
-                ( localize(5078, "Thinking parts will be collapsed by default.")),
-                ( localize(
-                5079,
+            type: "string",
+            default: "fixedScrolling",
+            enum: ["collapsed", "collapsedPreview", "fixedScrolling"],
+            enumDescriptions: [( localize(5231, "Thinking parts will be collapsed by default.")), ( localize(
+                5232,
                 "Thinking parts will be expanded first, then collapse once we reach a part that is not thinking."
-            )),
-                ( localize(
-                5080,
+            )), ( localize(
+                5233,
                 "Show thinking in a fixed-height streaming panel that auto-scrolls; click header to expand to full height."
-            )),
-            ],
-            description: ( localize(5081, "Controls how thinking is rendered.")),
-            tags: ['experimental'],
+            ))],
+            description: ( localize(5234, "Controls how thinking is rendered.")),
+            tags: ["experimental"]
         },
         [ChatConfiguration.ThinkingGenerateTitles]: {
-            type: 'boolean',
+            type: "boolean",
             default: true,
             description: ( localize(
-                5082,
+                5235,
                 "Controls whether to use an LLM to generate summary titles for thinking sections."
             )),
-            tags: ['experimental'],
-        },
-        'chat.agent.thinking.collapsedTools': {
-            type: 'string',
-            default: 'always',
-            enum: ['off', 'withThinking', 'always'],
-            enumDescriptions: [
-                ( localize(5083, "Tool calls are shown separately, not collapsed into thinking.")),
-                ( localize(
-                5084,
+            tags: ["experimental"]
+        },
+        "chat.agent.thinking.collapsedTools": {
+            type: "string",
+            default: "always",
+            enum: ["off", "withThinking", "always"],
+            enumDescriptions: [( localize(5236, "Tool calls are shown separately, not collapsed into thinking.")), ( localize(
+                5237,
                 "Tool calls are collapsed into thinking sections when thinking is present."
-            )),
-                ( localize(5085, "Tool calls are always collapsed, even without thinking.")),
-            ],
+            )), ( localize(5238, "Tool calls are always collapsed, even without thinking."))],
             markdownDescription: ( localize(
-                5086,
+                5239,
                 "Controls how tool calls are displayed in relation to thinking sections."
             )),
-            tags: ['experimental'],
+            tags: ["experimental"]
+        },
+        [ChatConfiguration.TerminalToolsInThinking]: {
+            type: "boolean",
+            default: true,
+            markdownDescription: ( localize(
+                5240,
+                "When enabled, terminal tool calls are displayed inside the thinking dropdown with a simplified view."
+            )),
+            tags: ["experimental"]
         },
-        'chat.disableAIFeatures': {
-            type: 'boolean',
+        [ChatConfiguration.AutoExpandToolFailures]: {
+            type: "boolean",
+            default: true,
+            markdownDescription: ( localize(
+                5241,
+                "When enabled, tool failures are automatically expanded in the chat UI to show error details."
+            ))
+        },
+        [ChatConfiguration.AIDisabled]: {
+            type: "boolean",
             description: ( localize(
-                5087,
+                5242,
                 "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."
             )),
             default: false,
             scope: ConfigurationScope.WINDOW
         },
-        'chat.allowAnonymousAccess': {
-            type: 'boolean',
-            description: ( localize(5088, "Controls whether anonymous access is allowed in chat.")),
+        "chat.allowAnonymousAccess": {
+            type: "boolean",
+            description: ( localize(5243, "Controls whether anonymous access is allowed in chat.")),
             default: false,
-            tags: ['experimental'],
+            tags: ["experimental"],
             experiment: {
-                mode: 'auto'
+                mode: "auto"
             }
         },
         [ChatConfiguration.RestoreLastPanelSession]: {
-            type: 'boolean',
+            type: "boolean",
             description: ( localize(
-                5089,
+                5244,
                 "Controls whether the last session is restored in panel after restart."
             )),
-            default: false,
-            tags: ['experimental'],
-            experiment: {
-                mode: 'auto'
-            }
+            default: false
         },
         [ChatConfiguration.ExitAfterDelegation]: {
-            type: 'boolean',
+            type: "boolean",
             description: ( localize(
-                5090,
+                5245,
                 "Controls whether the chat panel automatically exits after delegating a request to another session."
             )),
             default: true,
-            tags: ['preview'],
+            tags: ["preview"]
         },
-        'chat.extensionUnification.enabled': {
-            type: 'boolean',
+        "chat.extensionUnification.enabled": {
+            type: "boolean",
             description: ( localize(
-                5091,
+                5246,
                 "Enables the unification of GitHub Copilot extensions. When enabled, all GitHub Copilot functionality is served from the GitHub Copilot Chat extension. When disabled, the GitHub Copilot and GitHub Copilot Chat extensions operate independently."
             )),
             default: true,
-            tags: ['experimental'],
+            tags: ["experimental"],
             experiment: {
-                mode: 'auto'
+                mode: "auto"
             }
         },
         [ChatConfiguration.SubagentToolCustomAgents]: {
-            type: 'boolean',
+            type: "boolean",
             description: ( localize(
-                5092,
+                5247,
                 "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'],
+            tags: ["experimental"],
+            experiment: {
+                mode: "auto"
+            }
         }
     }
 });
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(5093, "Chat"))), [
-    ( new SyncDescriptor(ChatEditorInput))
-]);
-( Registry.as(Extensions$1.ConfigurationMigration)).registerConfigurationMigrations([
-    {
-        key: 'chat.experimental.detectParticipant.enabled',
-        migrateFn: (value, _accessor) => ([
-            ['chat.experimental.detectParticipant.enabled', { value: undefined }],
-            ['chat.detectParticipant.enabled', { value: value !== false }]
-        ])
-    },
-    {
-        key: 'chat.useClaudeSkills',
-        migrateFn: (value, _accessor) => ([
-            ['chat.useClaudeSkills', { value: undefined }],
-            ['chat.useAgentSkills', { value }]
-        ])
-    },
-    {
-        key: mcpDiscoverySection,
-        migrateFn: (value) => {
-            if (typeof value === 'boolean') {
-                return { value: Object.fromEntries(( allDiscoverySources.map(k => [k, value]))) };
-            }
-            return { value };
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
+    EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(5248, "Chat"))),
+    [( new SyncDescriptor(ChatEditorInput))]
+);
+( Registry.as(Extensions$1.ConfigurationMigration)).registerConfigurationMigrations([{
+    key: "chat.experimental.detectParticipant.enabled",
+    migrateFn: (value, _accessor) => ([["chat.experimental.detectParticipant.enabled", {
+        value: undefined
+    }], ["chat.detectParticipant.enabled", {
+        value: value !== false
+    }]])
+}, {
+    key: "chat.useClaudeSkills",
+    migrateFn: (value, _accessor) => ([["chat.useClaudeSkills", {
+        value: undefined
+    }], ["chat.useAgentSkills", {
+        value
+    }]])
+}, {
+    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'; }
+    static {
+        this.ID = "workbench.contrib.chatResolver";
+    }
     constructor(chatSessionsService, editorResolverService, instantiationService) {
         super();
         this.editorResolverService = editorResolverService;
@@ -1046,7 +1257,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         this._editorRegistrations = this._register(( new DisposableMap()));
         this._registerEditor(Schemas.vscodeChatEditor);
         this._registerEditor(Schemas.vscodeLocalChatSession);
-        this._register(chatSessionsService.onDidChangeContentProviderSchemes((e) => {
+        this._register(chatSessionsService.onDidChangeContentProviderSchemes(e => {
             for (const scheme of e.added) {
                 this._registerEditor(scheme);
             }
@@ -1061,13 +1272,18 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
     _registerEditor(scheme) {
         this._editorRegistrations.set(scheme, this.editorResolverService.registerEditor(`${scheme}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localize(5093, "Chat")),
+            label: ( localize(5248, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
-            canSupportResource: resource => resource.scheme === scheme,
+            canSupportResource: resource => resource.scheme === scheme
         }, {
-            createEditorInput: ({ resource, options }) => {
+            createEditorInput: (
+                {
+                    resource,
+                    options
+                }
+            ) => {
                 return {
                     editor: this.instantiationService.createInstance(ChatEditorInput, resource, options),
                     options
@@ -1076,13 +1292,11 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         }));
     }
 };
-ChatResolverContribution = ( __decorate([
-    ( __param(0, IChatSessionsService)),
-    ( __param(1, IEditorResolverService)),
-    ( __param(2, IInstantiationService))
-], ChatResolverContribution));
+ChatResolverContribution = ( __decorate([( __param(0, IChatSessionsService)), ( __param(1, IEditorResolverService)), ( __param(2, IInstantiationService))], ChatResolverContribution));
 let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.chatAgentSetting'; }
+    static {
+        this.ID = "workbench.contrib.chatAgentSetting";
+    }
     constructor(experimentService, entitlementService) {
         super();
         this.experimentService = experimentService;
@@ -1092,60 +1306,81 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Di
     registerMaxRequestsSetting() {
         let lastNode;
         const registerMaxRequestsSetting = () => {
-            const treatmentId = this.entitlementService.entitlement === ChatEntitlement.Free ?
-                'chatAgentMaxRequestsFree' :
-                'chatAgentMaxRequestsPro';
-            this.experimentService.getTreatment(treatmentId).then((value) => {
+            const treatmentId = this.entitlementService.entitlement === ChatEntitlement.Free ? "chatAgentMaxRequestsFree" : "chatAgentMaxRequestsPro";
+            this.experimentService.getTreatment(treatmentId).then(value => {
                 const defaultValue = value ?? (this.entitlementService.entitlement === ChatEntitlement.Free ? 25 : 25);
                 const node = {
-                    id: 'chatSidebar',
-                    title: ( localize(4993, "Chat")),
-                    type: 'object',
+                    id: "chatSidebar",
+                    title: ( localize(5122, "Chat")),
+                    type: "object",
                     properties: {
-                        'chat.agent.maxRequests': {
-                            type: 'number',
+                        "chat.agent.maxRequests": {
+                            type: "number",
                             markdownDescription: ( localize(
-                                5094,
+                                5249,
                                 "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,
-                        },
+                            default: defaultValue
+                        }
                     }
                 };
-                configurationRegistry.updateConfigurations({ remove: lastNode ? [lastNode] : [], add: [node] });
+                configurationRegistry.updateConfigurations({
+                    remove: lastNode ? [lastNode] : [],
+                    add: [node]
+                });
                 lastNode = node;
             });
         };
-        this._register(Event.runAndSubscribe(Event.debounce(this.entitlementService.onDidChangeEntitlement, () => { }, 1000), () => registerMaxRequestsSetting()));
+        this._register(Event.runAndSubscribe(
+            Event.debounce(this.entitlementService.onDidChangeEntitlement, () => {}, 1000),
+            () => registerMaxRequestsSetting()
+        ));
     }
 };
-ChatAgentSettingContribution = ( __decorate([
-    ( __param(0, IWorkbenchAssignmentService)),
-    ( __param(1, IChatEntitlementService))
-], ChatAgentSettingContribution));
+ChatAgentSettingContribution = ( __decorate([( __param(0, IWorkbenchAssignmentService)), ( __param(1, IChatEntitlementService))], ChatAgentSettingContribution));
+function getCustomModesWithUniqueNames(builtinModes, customModes) {
+    const customModeIds = ( new Set());
+    const builtinNames = ( new Set(( builtinModes.map(mode => mode.name.get()))));
+    const customNameToId = ( new Map());
+    for (const mode of customModes) {
+        const modeName = mode.name.get();
+        if (( builtinNames.has(modeName))) {
+            continue;
+        }
+        const existingId = customNameToId.get(modeName);
+        if (existingId) {
+            customModeIds.delete(existingId);
+        }
+        customNameToId.set(modeName, mode.id);
+        customModeIds.add(mode.id);
+    }
+    return customModeIds;
+}
 let ChatAgentActionsContribution = class ChatAgentActionsContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.chatAgentActions'; }
+    static {
+        this.ID = "workbench.contrib.chatAgentActions";
+    }
     constructor(chatModeService) {
         super();
         this.chatModeService = chatModeService;
         this._modeActionDisposables = ( new DisposableMap());
         this._store.add(this._modeActionDisposables);
-        const { custom } = this.chatModeService.getModes();
+        const {
+            builtin,
+            custom
+        } = this.chatModeService.getModes();
+        const currentModeIds = getCustomModesWithUniqueNames(builtin, custom);
         for (const mode of custom) {
-            this._registerModeAction(mode);
+            if (( currentModeIds.has(mode.id))) {
+                this._registerModeAction(mode);
+            }
         }
         this._register(this.chatModeService.onDidChangeChatModes(() => {
-            const { custom } = this.chatModeService.getModes();
-            const currentModeIds = ( new Set());
-            const currentModeNames = ( new Map());
-            for (const mode of custom) {
-                const modeName = mode.name.get();
-                if (( currentModeNames.has(modeName))) {
-                    currentModeIds.delete(currentModeNames.get(modeName));
-                }
-                currentModeNames.set(modeName, mode.id);
-                currentModeIds.add(mode.id);
-            }
+            const {
+                builtin,
+                custom
+            } = this.chatModeService.getModes();
+            const currentModeIds = getCustomModesWithUniqueNames(builtin, custom);
             for (const modeId of ( this._modeActionDisposables.keys())) {
                 if (!( currentModeIds.has(modeId))) {
                     this._modeActionDisposables.deleteAndDispose(modeId);
@@ -1167,43 +1402,41 @@ let ChatAgentActionsContribution = class ChatAgentActionsContribution extends Di
         this._modeActionDisposables.set(mode.id, registerAction2(actionClass));
     }
 };
-ChatAgentActionsContribution = ( __decorate([
-    ( __param(0, IChatModeService))
-], ChatAgentActionsContribution));
+ChatAgentActionsContribution = ( __decorate([( __param(0, IChatModeService))], ChatAgentActionsContribution));
 let ToolReferenceNamesContribution = class ToolReferenceNamesContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.toolReferenceNames'; }
+    static {
+        this.ID = "workbench.contrib.toolReferenceNames";
+    }
     constructor(_languageModelToolsService) {
         super();
         this._languageModelToolsService = _languageModelToolsService;
         this._updateToolReferenceNames();
-        this._register(this._languageModelToolsService.onDidChangeTools(() => this._updateToolReferenceNames()));
+        this._register(
+            this._languageModelToolsService.onDidChangeTools(() => this._updateToolReferenceNames())
+        );
     }
     _updateToolReferenceNames() {
-        const tools = Array.from(this._languageModelToolsService.getTools())
-            .filter((tool) => typeof tool.toolReferenceName === 'string')
-            .sort((a, b) => a.toolReferenceName.localeCompare(b.toolReferenceName));
+        const tools = Array.from(this._languageModelToolsService.getAllToolsIncludingDisabled()).filter(tool => typeof tool.toolReferenceName === "string").sort((a, b) => a.toolReferenceName.localeCompare(b.toolReferenceName));
         toolReferenceNameEnumValues.length = 0;
         toolReferenceNameEnumDescriptions.length = 0;
         for (const tool of tools) {
             toolReferenceNameEnumValues.push(tool.toolReferenceName);
             toolReferenceNameEnumDescriptions.push(( localize(
-                5095,
+                5250,
                 "{0} - {1}",
                 tool.toolReferenceName,
                 tool.userDescription || tool.displayName
             )));
         }
         configurationRegistry.notifyConfigurationSchemaUpdated({
-            id: 'chatSidebar',
+            id: "chatSidebar",
             properties: {
                 [ChatConfiguration.EligibleForAutoApproval]: {}
             }
         });
     }
 };
-ToolReferenceNamesContribution = ( __decorate([
-    ( __param(0, ILanguageModelToolsService))
-], ToolReferenceNamesContribution));
+ToolReferenceNamesContribution = ( __decorate([( __param(0, ILanguageModelToolsService))], ToolReferenceNamesContribution));
 AccessibleViewRegistry.register(( new ChatTerminalOutputAccessibleView()));
 AccessibleViewRegistry.register(( new ChatResponseAccessibleView()));
 AccessibleViewRegistry.register(( new PanelChatAccessibilityHelp()));
@@ -1212,22 +1445,32 @@ AccessibleViewRegistry.register(( new EditsChatAccessibilityHelp()));
 AccessibleViewRegistry.register(( new AgentChatAccessibilityHelp()));
 registerEditorFeature(ChatInputBoxContentProvider);
 let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommandsContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.chatSlashStaticSlashCommands'; }
-    constructor(slashCommandService, commandService, chatAgentService, chatWidgetService, instantiationService) {
+    static {
+        this.ID = "workbench.contrib.chatSlashStaticSlashCommands";
+    }
+    constructor(
+        slashCommandService,
+        commandService,
+        chatAgentService,
+        chatWidgetService,
+        instantiationService,
+        agentSessionsService
+    ) {
         super();
         this._store.add(slashCommandService.registerSlashCommand({
-            command: 'clear',
-            detail: ( localize(5096, "Start a new chat")),
-            sortText: 'z2_clear',
+            command: "clear",
+            detail: ( localize(5251, "Start a new chat and archive the current one")),
+            sortText: "z2_clear",
             executeImmediately: true,
             locations: [ChatAgentLocation.Chat]
-        }, async () => {
+        }, async (_prompt, _progress, _history, _location, sessionResource) => {
+            agentSessionsService.getSession(sessionResource)?.setArchived(true);
             commandService.executeCommand(ACTION_ID_NEW_CHAT);
         }));
         this._store.add(slashCommandService.registerSlashCommand({
-            command: 'help',
-            detail: '',
-            sortText: 'z1_help',
+            command: "help",
+            detail: "",
+            sortText: "z1_help",
             executeImmediately: true,
             locations: [ChatAgentLocation.Chat],
             modes: [ChatModeKind.Ask]
@@ -1236,84 +1479,214 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
             const agents = chatAgentService.getAgents();
             if (defaultAgent?.metadata.helpTextPrefix) {
                 if (isMarkdownString(defaultAgent.metadata.helpTextPrefix)) {
-                    progress.report({ content: defaultAgent.metadata.helpTextPrefix, kind: 'markdownContent' });
-                }
-                else {
-                    progress.report({ content: ( new MarkdownString(defaultAgent.metadata.helpTextPrefix)), kind: 'markdownContent' });
+                    progress.report({
+                        content: defaultAgent.metadata.helpTextPrefix,
+                        kind: "markdownContent"
+                    });
+                } else {
+                    progress.report({
+                        content: ( new MarkdownString(defaultAgent.metadata.helpTextPrefix)),
+                        kind: "markdownContent"
+                    });
                 }
-                progress.report({ content: ( new MarkdownString('\n\n')), kind: 'markdownContent' });
+                progress.report({
+                    content: ( new MarkdownString("\n\n")),
+                    kind: "markdownContent"
+                });
             }
-            const agentText = (await Promise.all(( agents
-                .filter(a => !a.isDefault && !a.isCore)
-                .filter(a => a.locations.includes(ChatAgentLocation.Chat))
-                .map(async (a) => {
-                const description = a.description ? `- ${a.description}` : '';
+            const agentText = (await Promise.all(( agents.filter(a => !a.isDefault && !a.isCore).filter(a => a.locations.includes(ChatAgentLocation.Chat)).map(async a => {
+                const description = a.description ? `- ${a.description}` : "";
                 const agentMarkdown = instantiationService.invokeFunction(accessor => agentToMarkdown(a, sessionResource, true, accessor));
                 const agentLine = `- ${agentMarkdown} ${description}`;
                 const commandText = ( a.slashCommands.map(c => {
-                    const description = c.description ? `- ${c.description}` : '';
+                    const description = c.description ? `- ${c.description}` : "";
                     return `\t* ${agentSlashCommandToMarkdown(a, c, sessionResource)} ${description}`;
-                })).join('\n');
-                return (agentLine + '\n' + commandText).trim();
-            })))).join('\n');
-            progress.report({ content: ( new MarkdownString(agentText, { isTrusted: { enabledCommands: [ChatSubmitAction.ID] } })), kind: 'markdownContent' });
+                })).join("\n");
+                return (agentLine + "\n" + commandText).trim();
+            })))).join("\n");
+            progress.report({
+                content: ( new MarkdownString(agentText, {
+                    isTrusted: {
+                        enabledCommands: [ChatSubmitAction.ID]
+                    }
+                })),
+                kind: "markdownContent"
+            });
             if (defaultAgent?.metadata.helpTextPostfix) {
-                progress.report({ content: ( new MarkdownString('\n\n')), kind: 'markdownContent' });
+                progress.report({
+                    content: ( new MarkdownString("\n\n")),
+                    kind: "markdownContent"
+                });
                 if (isMarkdownString(defaultAgent.metadata.helpTextPostfix)) {
-                    progress.report({ content: defaultAgent.metadata.helpTextPostfix, kind: 'markdownContent' });
-                }
-                else {
-                    progress.report({ content: ( new MarkdownString(defaultAgent.metadata.helpTextPostfix)), kind: 'markdownContent' });
+                    progress.report({
+                        content: defaultAgent.metadata.helpTextPostfix,
+                        kind: "markdownContent"
+                    });
+                } else {
+                    progress.report({
+                        content: ( new MarkdownString(defaultAgent.metadata.helpTextPostfix)),
+                        kind: "markdownContent"
+                    });
                 }
             }
             await timeout(200);
         }));
     }
 };
-ChatSlashStaticSlashCommandsContribution = ( __decorate([
-    ( __param(0, IChatSlashCommandService)),
-    ( __param(1, ICommandService)),
-    ( __param(2, IChatAgentService)),
-    ( __param(3, IChatWidgetService)),
-    ( __param(4, IInstantiationService))
-], ChatSlashStaticSlashCommandsContribution));
+ChatSlashStaticSlashCommandsContribution = ( __decorate([( __param(0, IChatSlashCommandService)), ( __param(1, ICommandService)), ( __param(2, IChatAgentService)), ( __param(3, IChatWidgetService)), ( __param(4, IInstantiationService)), ( __param(5, IAgentSessionsService))], ChatSlashStaticSlashCommandsContribution));
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
-registerWorkbenchContribution2(ChatResolverContribution.ID, ChatResolverContribution, WorkbenchPhase.BlockStartup);
-registerWorkbenchContribution2(ChatSlashStaticSlashCommandsContribution.ID, ChatSlashStaticSlashCommandsContribution, WorkbenchPhase.Eventually);
-registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, WorkbenchPhase.BlockStartup);
-registerWorkbenchContribution2(LanguageModelToolsExtensionPointHandler.ID, LanguageModelToolsExtensionPointHandler, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(ChatPromptFilesExtensionPointHandler.ID, ChatPromptFilesExtensionPointHandler, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(ChatCompatibilityNotifier.ID, ChatCompatibilityNotifier, WorkbenchPhase.Eventually);
-registerWorkbenchContribution2(CopilotTitleBarMenuRendering.ID, CopilotTitleBarMenuRendering, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(CodeBlockActionRendering.ID, CodeBlockActionRendering, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(ContinueChatInSessionActionRendering.ID, ContinueChatInSessionActionRendering, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(ChatImplicitContextContribution.ID, ChatImplicitContextContribution, WorkbenchPhase.Eventually);
-registerWorkbenchContribution2(ChatRelatedFilesContribution.ID, ChatRelatedFilesContribution, WorkbenchPhase.Eventually);
-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(
+    ChatResolverContribution.ID,
+    ChatResolverContribution,
+    WorkbenchPhase.BlockStartup
+);
+registerWorkbenchContribution2(
+    ChatLanguageModelsDataContribution.ID,
+    ChatLanguageModelsDataContribution,
+    WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(
+    ChatSlashStaticSlashCommandsContribution.ID,
+    ChatSlashStaticSlashCommandsContribution,
+    WorkbenchPhase.Eventually
+);
+registerWorkbenchContribution2(
+    ChatExtensionPointHandler.ID,
+    ChatExtensionPointHandler,
+    WorkbenchPhase.BlockStartup
+);
+registerWorkbenchContribution2(
+    LanguageModelToolsExtensionPointHandler.ID,
+    LanguageModelToolsExtensionPointHandler,
+    WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(
+    ChatPromptFilesExtensionPointHandler.ID,
+    ChatPromptFilesExtensionPointHandler,
+    WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(
+    ChatCompatibilityNotifier.ID,
+    ChatCompatibilityNotifier,
+    WorkbenchPhase.Eventually
+);
+registerWorkbenchContribution2(
+    CodeBlockActionRendering.ID,
+    CodeBlockActionRendering,
+    WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(
+    ChatImplicitContextContribution.ID,
+    ChatImplicitContextContribution,
+    WorkbenchPhase.Eventually
+);
+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);
-registerWorkbenchContribution2(ChatAgentActionsContribution.ID, ChatAgentActionsContribution, WorkbenchPhase.Eventually);
-registerWorkbenchContribution2(ToolReferenceNamesContribution.ID, ToolReferenceNamesContribution, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(ChatAgentRecommendation.ID, ChatAgentRecommendation, WorkbenchPhase.Eventually);
-registerWorkbenchContribution2(ChatEditingEditorAccessibility.ID, ChatEditingEditorAccessibility, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(ChatEditingEditorOverlay.ID, ChatEditingEditorOverlay, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(SimpleBrowserOverlay.ID, SimpleBrowserOverlay, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(ChatEditingEditorContextKeys.ID, ChatEditingEditorContextKeys, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(ChatTransferContribution.ID, ChatTransferContribution, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(ChatContextContributions.ID, ChatContextContributions, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(ChatResponseResourceFileSystemProvider.ID, ChatResponseResourceFileSystemProvider, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(
+    BuiltinToolsContribution.ID,
+    BuiltinToolsContribution,
+    WorkbenchPhase.Eventually
+);
+registerWorkbenchContribution2(
+    ChatAgentSettingContribution.ID,
+    ChatAgentSettingContribution,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    ChatAgentActionsContribution.ID,
+    ChatAgentActionsContribution,
+    WorkbenchPhase.Eventually
+);
+registerWorkbenchContribution2(
+    ToolReferenceNamesContribution.ID,
+    ToolReferenceNamesContribution,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    ChatAgentRecommendation.ID,
+    ChatAgentRecommendation,
+    WorkbenchPhase.Eventually
+);
+registerWorkbenchContribution2(
+    ChatEditingEditorAccessibility.ID,
+    ChatEditingEditorAccessibility,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    ChatEditingEditorOverlay.ID,
+    ChatEditingEditorOverlay,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    SimpleBrowserOverlay.ID,
+    SimpleBrowserOverlay,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    ChatEditingEditorContextKeys.ID,
+    ChatEditingEditorContextKeys,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    ChatTransferContribution.ID,
+    ChatTransferContribution,
+    WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(
+    ChatContextContributions.ID,
+    ChatContextContributions,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    ChatResponseResourceFileSystemProvider.ID,
+    ChatResponseResourceFileSystemProvider,
+    WorkbenchPhase.AfterRestored
+);
 registerWorkbenchContribution2(PromptUrlHandler.ID, PromptUrlHandler, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);
-registerWorkbenchContribution2(UserToolSetsContributions.ID, UserToolSetsContributions, WorkbenchPhase.Eventually);
-registerWorkbenchContribution2(PromptLanguageFeaturesProvider.ID, PromptLanguageFeaturesProvider, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(
+    ChatEditingNotebookFileSystemProviderContrib.ID,
+    ChatEditingNotebookFileSystemProviderContrib,
+    WorkbenchPhase.BlockStartup
+);
+registerWorkbenchContribution2(
+    UserToolSetsContributions.ID,
+    UserToolSetsContributions,
+    WorkbenchPhase.Eventually
+);
+registerWorkbenchContribution2(
+    PromptLanguageFeaturesProvider.ID,
+    PromptLanguageFeaturesProvider,
+    WorkbenchPhase.Eventually
+);
 registerWorkbenchContribution2(ChatWindowNotifier.ID, ChatWindowNotifier, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(
+    ChatRepoInfoContribution.ID,
+    ChatRepoInfoContribution,
+    WorkbenchPhase.Eventually
+);
 registerChatActions();
 registerChatAccessibilityActions();
 registerChatCopyActions();
+registerChatCustomizationDiagnosticsAction();
 registerChatCodeBlockActions();
 registerChatCodeCompareBlockActions();
 registerChatFileTreeActions();