@codingame/monaco-vscode-chat-service-override 17.2.1 → 18.0.1

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

@@ -1,11 +1,12 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import './promptSyntax/promptToolsCodeLensProvider.js';
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { isMarkdownString, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { isLinux, isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { registerEditorFeature } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorFeatures';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -15,22 +16,23 @@ 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 { PromptsConfig } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/config';
-import { PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/constants';
+import { mcpGalleryServiceUrlConfig } from '@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/platform/mcp/common/mcpManagement';
+import { PromptsConfig } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/config';
+import { MODE_DEFAULT_SOURCE_FOLDER, MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { EditorPaneDescriptor } from '@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/editor';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common/vscode/vs/workbench/browser/editor';
 import { Extensions as Extensions$1 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/configuration';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
-import { mcpSchemaId } from '@codingame/monaco-vscode-4a0e04a7-c3bd-5fb7-9d3b-4fd047cc9e59-common/vscode/vs/workbench/services/configuration/common/configuration';
+import { mcpSchemaId } from '@codingame/monaco-vscode-ce7c734f-7712-563c-9335-d7acb43306af-common/vscode/vs/workbench/services/configuration/common/configuration';
 import { RegisteredEditorPriority } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service';
-import { mcpDiscoverySection, allDiscoverySources, discoverySourceLabel, mcpConfigurationSection, mcpSchemaExampleServers, mcpEnabledSection } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { mcpDiscoverySection, allDiscoverySources, discoverySourceLabel, mcpConfigurationSection, mcpSchemaExampleServers, mcpServerSamplingSection, mcpEnabledSection } from '@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { ChatEntitlement } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
+import { ChatEntitlement } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementService.service';
 import { chatVariableLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import '../common/chatServiceImpl.js';
@@ -40,17 +42,19 @@ import '../common/chatTransferService.js';
 import '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService';
 import { ChatConfiguration, ChatAgentLocation, ChatMode } 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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/languageModelStats';
-import { PROMPT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
+import '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/languageModelStats';
+import { MODE_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
 import { registerPromptFileContributions } from '../common/promptSyntax/contributions/index.js';
 import '../common/promptSyntax/service/promptsService.js';
 import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
 import { BuiltinToolsContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/tools';
+import { UserToolSetsContributions, ConfigureToolSets } from './tools/toolSetsContribution.js';
 import '../common/voiceChatService.js';
 import { PanelChatAccessibilityHelp, QuickChatAccessibilityHelp, EditsChatAccessibilityHelp, AgentChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
-import { CopilotTitleBarMenuRendering, registerChatActions } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ACTION_ID_NEW_CHAT, registerNewChatActions } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClearActions';
+import { ACTION_ID_NEW_CHAT, CopilotTitleBarMenuRendering, registerChatActions } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { registerNewChatActions } from './actions/chatClearActions.js';
 import { CodeBlockActionRendering, registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from './actions/chatCodeblockActions.js';
+import { ChatContextContributions } from './actions/chatContext.js';
 import { registerChatContextActions } from './actions/chatContextActions.js';
 import { registerChatCopyActions } from './actions/chatCopyActions.js';
 import { registerChatDeveloperActions } from './actions/chatDeveloperActions.js';
@@ -61,13 +65,16 @@ import { registerChatExportActions } from './actions/chatImportExport.js';
 import { registerMoveActions } from './actions/chatMoveActions.js';
 import { registerQuickChatActions } from './actions/chatQuickInputActions.js';
 import { registerChatTitleActions } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
-import { registerChatToolActions } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatToolActions';
+import { registerChatToolActions } from './actions/chatToolActions.js';
 import { ChatTransferContribution } from './actions/chatTransfer.js';
 import { SAVE_TO_PROMPT_SLASH_COMMAND_NAME, runSaveToPromptAction } from './actions/promptActions/chatSaveToPromptAction.js';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import './chatAccessibilityService.js';
 import '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatAttachmentModel';
 import '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { ChatInputBoxContentProvider } from './chatEdinputInputContentProvider.js';
 import { ChatEditingEditorAccessibility } from './chatEditing/chatEditingEditorAccessibility.js';
 import { registerChatEditorActions } from './chatEditing/chatEditingEditorActions.js';
@@ -77,10 +84,10 @@ import './chatEditing/chatEditingServiceImpl.js';
 import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
 import { SimpleBrowserOverlay } from './chatEditing/simpleBrowserEditorOverlay.js';
 import { ChatEditor } from './chatEditor.js';
-import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
 import { ChatExtensionPointHandler, ChatCompatibilityNotifier } from './chatParticipant.contribution.js';
-import { ChatPasteProvidersFeature } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatPasteProviders';
+import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
 import './chatQuick.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
 import { ChatSetupContribution } from './chatSetup.js';
@@ -93,41 +100,44 @@ import './contrib/chatInputEditorContrib.js';
 import './contrib/chatInputEditorHover.js';
 import { ChatRelatedFilesContribution } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib';
 import './languageModelToolsService.js';
-import './promptSyntax/contributions/attachInstructionsCommand.js';
 import './promptSyntax/contributions/createPromptCommand/createPromptCommand.js';
 import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
+import { registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
+import '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModes';
+import { ChatResponseResourceFileSystemProvider } from '../common/chatResponseResourceFileSystemProvider.js';
 
 const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'chatSidebar',
-    title: ( localize(4531, "Chat")),
+    title: ( localize(4570, "Chat")),
     type: 'object',
     properties: {
         'chat.editor.fontSize': {
             type: 'number',
-            description: ( localize(4532, "Controls the font size in pixels in chat codeblocks.")),
+            description: ( localize(4571, "Controls the font size in pixels in chat codeblocks.")),
             default: isMacintosh ? 12 : 14,
         },
         'chat.editor.fontFamily': {
             type: 'string',
-            description: ( localize(4533, "Controls the font family in chat codeblocks.")),
+            description: ( localize(4572, "Controls the font family in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.fontWeight': {
             type: 'string',
-            description: ( localize(4534, "Controls the font weight in chat codeblocks.")),
+            description: ( localize(4573, "Controls the font weight in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.wordWrap': {
             type: 'string',
-            description: ( localize(4535, "Controls whether lines should wrap in chat codeblocks.")),
+            description: ( localize(4574, "Controls whether lines should wrap in chat codeblocks.")),
             default: 'off',
             enum: ['on', 'off']
         },
         'chat.editor.lineHeight': {
             type: 'number',
             description: ( localize(
-                4536,
+                4575,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
@@ -135,7 +145,7 @@ configurationRegistry.registerConfiguration({
         'chat.commandCenter.enabled': {
             type: 'boolean',
             markdownDescription: ( localize(
-                4537,
+                4576,
                 "Controls whether the command center shows a menu for actions to control Copilot (requires {0}).",
                 '`#window.commandCenter#`'
             )),
@@ -145,17 +155,17 @@ configurationRegistry.registerConfiguration({
             type: 'object',
             tags: ['experimental'],
             description: ( localize(
-                4538,
+                4577,
                 "Enables automatically using the active editor as chat context for specified chat locations."
             )),
             additionalProperties: {
                 type: 'string',
                 enum: ['never', 'first', 'always'],
-                description: ( localize(4539, "The value for the implicit context.")),
+                description: ( localize(4578, "The value for the implicit context.")),
                 enumDescriptions: [
-                    ( localize(4540, "Implicit context is never enabled.")),
-                    ( localize(4541, "Implicit context is enabled for the first interaction.")),
-                    ( localize(4542, "Implicit context is always enabled."))
+                    ( localize(4579, "Implicit context is never enabled.")),
+                    ( localize(4580, "Implicit context is enabled for the first interaction.")),
+                    ( localize(4581, "Implicit context is always enabled."))
                 ]
             },
             default: {
@@ -165,7 +175,7 @@ configurationRegistry.registerConfiguration({
         'chat.editing.autoAcceptDelay': {
             type: 'number',
             markdownDescription: ( localize(
-                4543,
+                4582,
                 "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,
@@ -176,7 +186,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4544,
+                4583,
                 "Whether to show a confirmation before removing a request and its associated edits."
             )),
             default: true,
@@ -185,7 +195,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4545,
+                4584,
                 "Whether to show a confirmation before retrying a request and its associated edits."
             )),
             default: true,
@@ -193,36 +203,37 @@ configurationRegistry.registerConfiguration({
         'chat.experimental.detectParticipant.enabled': {
             type: 'boolean',
             deprecationMessage: ( localize(
-                4546,
+                4585,
                 "This setting is deprecated. Please use `chat.detectParticipant.enabled` instead."
             )),
-            description: ( localize(4547, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4586, "Enables chat participant autodetection for panel chat.")),
             default: null
         },
         'chat.detectParticipant.enabled': {
             type: 'boolean',
-            description: ( localize(4548, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4587, "Enables chat participant autodetection for panel chat.")),
             default: true
         },
         'chat.renderRelatedFiles': {
             type: 'boolean',
             description: ( localize(
-                4549,
+                4588,
                 "Controls whether related files should be rendered in the chat input."
             )),
             default: false
         },
-        'chat.focusWindowOnConfirmation': {
+        'chat.notifyWindowOnConfirmation': {
             type: 'boolean',
+            included: !isLinux,
             description: ( localize(
-                4550,
-                "Controls whether the Copilot window should be focused when a confirmation is needed."
+                4589,
+                "Controls whether the Copilot window should notify the user when a confirmation is needed."
             )),
             default: true,
         },
         'chat.tools.autoApprove': {
             default: false,
-            description: ( localize(4551, "Controls whether tool use should be automatically approved.")),
+            description: ( localize(4590, "Controls whether tool use should be automatically approved.")),
             type: 'boolean',
             tags: ['experimental'],
             policy: {
@@ -235,7 +246,7 @@ configurationRegistry.registerConfiguration({
         'chat.sendElementsToChat.enabled': {
             default: true,
             description: ( localize(
-                4552,
+                4591,
                 "Controls whether elements can be sent to chat from the Simple Browser."
             )),
             type: 'boolean',
@@ -244,7 +255,7 @@ configurationRegistry.registerConfiguration({
         'chat.sendElementsToChat.attachCSS': {
             default: true,
             markdownDescription: ( localize(
-                4553,
+                4592,
                 "Controls whether CSS of the selected element will be added to the chat. {0} must be enabled.",
                 '`#chat.sendElementsToChat.enabled#`'
             )),
@@ -254,7 +265,7 @@ configurationRegistry.registerConfiguration({
         'chat.sendElementsToChat.attachImages': {
             default: true,
             markdownDescription: ( localize(
-                4554,
+                4593,
                 "Controls whether a screenshot of the selected element will be added to the chat. {0} must be enabled.",
                 '`#chat.sendElementsToChat.enabled#`'
             )),
@@ -264,7 +275,7 @@ configurationRegistry.registerConfiguration({
         [mcpEnabledSection]: {
             type: 'boolean',
             description: ( localize(
-                4555,
+                4594,
                 "Enables integration with Model Context Protocol servers to provide additional tools and functionality."
             )),
             default: true,
@@ -276,19 +287,56 @@ configurationRegistry.registerConfiguration({
                 defaultValue: false
             }
         },
+        [mcpServerSamplingSection]: {
+            type: 'object',
+            description: ( localize(
+                4595,
+                "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(4596, 'List Servers'))
+            )),
+            scope: ConfigurationScope.RESOURCE,
+            additionalProperties: {
+                type: 'object',
+                properties: {
+                    allowedDuringChat: {
+                        type: 'boolean',
+                        description: ( localize(
+                            4597,
+                            "Whether this server is make sampling requests during its tool calls in a chat session."
+                        )),
+                        default: true,
+                    },
+                    allowedOutsideChat: {
+                        type: 'boolean',
+                        description: ( localize(
+                            4598,
+                            "Whether this server is allowed to make sampling requests outside of a chat session."
+                        )),
+                        default: false,
+                    },
+                    allowedModels: {
+                        type: 'array',
+                        items: {
+                            type: 'string',
+                            description: ( localize(4599, "A model the MCP server has access to.")),
+                        },
+                    }
+                }
+            },
+        },
         [mcpConfigurationSection]: {
             type: 'object',
             default: {
                 inputs: [],
                 servers: mcpSchemaExampleServers,
             },
-            description: ( localize(4556, "Model Context Protocol server configurations")),
+            description: ( localize(4600, "Model Context Protocol server configurations")),
             $ref: mcpSchemaId
         },
         [ChatConfiguration.UseFileStorage]: {
             type: 'boolean',
             description: ( localize(
-                4557,
+                4601,
                 "Enables storing chat sessions on disk instead of in the storage service. Enabling this does a one-time per-workspace migration of existing sessions to the new format."
             )),
             default: true,
@@ -297,7 +345,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.Edits2Enabled]: {
             type: 'boolean',
             description: ( localize(
-                4558,
+                4602,
                 "Enable the new Edits mode that is based on tool-calling. When this is enabled, models that don't support tool-calling are unavailable for Edits mode."
             )),
             default: true,
@@ -305,20 +353,18 @@ configurationRegistry.registerConfiguration({
         },
         [ChatConfiguration.ExtensionToolsEnabled]: {
             type: 'boolean',
-            description: ( localize(4559, "Enable using tools contributed by third-party extensions.")),
+            description: ( localize(4603, "Enable using tools contributed by third-party extensions.")),
             default: true,
             policy: {
                 name: 'ChatAgentExtensionTools',
                 minimumVersion: '1.99',
-                description: ( localize(4560, "Enable using tools contributed by third-party extensions.")),
-                previewFeature: true,
-                defaultValue: false
+                description: ( localize(4604, "Enable using tools contributed by third-party extensions.")),
             }
         },
         [ChatConfiguration.AgentEnabled]: {
             type: 'boolean',
             description: ( localize(
-                4561,
+                4605,
                 "Enable agent mode for {0}. When this is enabled, agent mode can be activated via the dropdown in the view.",
                 'Copilot Chat'
             )),
@@ -339,21 +385,33 @@ configurationRegistry.registerConfiguration({
                     default: Object.fromEntries(( allDiscoverySources.map(k => [k, true]))),
                     properties: Object.fromEntries(( allDiscoverySources.map(k => [
                         k,
-                        { type: 'boolean', description: ( localize(4562, "Enables discovery of {0} servers", discoverySourceLabel[k])) }
+                        { type: 'boolean', description: ( localize(4606, "Enables discovery of {0} servers", discoverySourceLabel[k])) }
                     ]))),
                 }
             ],
             default: true,
             markdownDescription: ( localize(
-                4563,
+                4607,
                 "Configures discovery of Model Context Protocol servers on the machine. It may be set to `true` or `false` to disable or enable all sources, and an mapping sources you wish to enable."
             )),
         },
+        [mcpGalleryServiceUrlConfig]: {
+            type: 'string',
+            description: ( localize(4608, "Configure the MCP Gallery service URL to connect to")),
+            default: '',
+            scope: ConfigurationScope.APPLICATION,
+            tags: ['usesOnlineServices'],
+            included: false,
+            policy: {
+                name: 'McpGalleryServiceUrl',
+                minimumVersion: '1.101',
+            },
+        },
         [PromptsConfig.KEY]: {
             type: 'boolean',
-            title: ( localize(4564, "Prompt Files")),
+            title: ( localize(4609, "Prompt Files")),
             markdownDescription: ( localize(
-                4565,
+                4610,
                 "Enable reusable prompt (`*{0}`) and instruction files in Chat, Edits, and Inline Chat sessions. [Learn More]({1}).",
                 PROMPT_FILE_EXTENSION,
                 INSTRUCTION_FILE_EXTENSION,
@@ -367,7 +425,7 @@ configurationRegistry.registerConfiguration({
                 name: 'ChatPromptFiles',
                 minimumVersion: '1.99',
                 description: ( localize(
-                    4566,
+                    4611,
                     "Enables reusable prompt and instruction files in Chat, Edits, and Inline Chat sessions."
                 )),
                 previewFeature: true,
@@ -376,9 +434,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.INSTRUCTIONS_LOCATION_KEY]: {
             type: 'object',
-            title: ( localize(4567, "Instructions File Locations")),
+            title: ( localize(4612, "Instructions File Locations")),
             markdownDescription: ( localize(
-                4568,
+                4613,
                 "Specify location(s) of instructions files (`*{0}`) that can be attached in Chat, Edits, and Inline Chat sessions. [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
                 INSTRUCTION_FILE_EXTENSION,
                 INSTRUCTIONS_DOCUMENTATION_URL
@@ -401,9 +459,9 @@ configurationRegistry.registerConfiguration({
         },
         [PromptsConfig.PROMPT_LOCATIONS_KEY]: {
             type: 'object',
-            title: ( localize(4569, "Prompt File Locations")),
+            title: ( localize(4614, "Prompt File Locations")),
             markdownDescription: ( localize(
-                4570,
+                4615,
                 "Specify location(s) of reusable prompt files (`*{0}`) that can be run in Chat, Edits, and Inline Chat sessions. [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
                 PROMPT_FILE_EXTENSION,
                 PROMPT_DOCUMENTATION_URL
@@ -425,9 +483,54 @@ configurationRegistry.registerConfiguration({
                 },
             ],
         },
+        [PromptsConfig.MODE_LOCATION_KEY]: {
+            type: 'object',
+            title: ( localize(4616, "Mode File Locations")),
+            markdownDescription: ( localize(
+                4617,
+                "Specify location(s) of custom chat mode files (`*{0}`). [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
+                MODE_FILE_EXTENSION,
+                MODE_DOCUMENTATION_URL
+            )),
+            default: {
+                [MODE_DEFAULT_SOURCE_FOLDER]: true,
+            },
+            additionalProperties: { type: 'boolean' },
+            unevaluatedProperties: { type: 'boolean' },
+            restricted: true,
+            tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
+            examples: [
+                {
+                    [MODE_DEFAULT_SOURCE_FOLDER]: true,
+                },
+                {
+                    [MODE_DEFAULT_SOURCE_FOLDER]: true,
+                    '/Users/vscode/repos/chatmodes': true,
+                },
+            ],
+        },
+        'chat.setup.signInWithAlternateProvider': {
+            type: 'boolean',
+            description: ( localize(4618, "Enable alternative sign-in provider.")),
+            default: false,
+            tags: ['onExp', 'experimental'],
+        },
+        'chat.setup.signInDialogVariant': {
+            type: 'string',
+            enum: ['default', 'modern', 'brand-gh', 'brand-vsc', 'style-glow', 'alt-first', 'input-email', 'account-create'],
+            description: ( localize(4619, "Control variations of the sign-in dialog.")),
+            default: product.quality !== 'stable' ? 'modern' : 'default',
+            tags: ['onExp', 'experimental']
+        },
+        'chat.setup.continueLaterIndicator': {
+            type: 'boolean',
+            description: ( localize(4620, "Enable indicator in the status bar to finish chat setup.")),
+            default: false,
+            tags: ['onExp', 'experimental'],
+        },
     }
 });
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4571, "Chat"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4621, "Chat"))), [
     ( new SyncDescriptor(ChatEditorInput))
 ]);
 ( Registry.as(Extensions$1.ConfigurationMigration)).registerConfigurationMigrations([
@@ -445,7 +548,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         super();
         this._register(editorResolverService.registerEditor(`${Schemas.vscodeChatSesssion}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localize(4571, "Chat")),
+            label: ( localize(4621, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
@@ -472,21 +575,21 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Di
     registerMaxRequestsSetting() {
         let lastNode;
         const registerMaxRequestsSetting = () => {
-            const treatmentId = this.entitlementService.entitlement === ChatEntitlement.Limited ?
+            const treatmentId = this.entitlementService.entitlement === ChatEntitlement.Free ?
                 'chatAgentMaxRequestsFree' :
                 'chatAgentMaxRequestsPro';
             this.experimentService.getTreatment(treatmentId).then(value => {
-                const defaultValue = value ?? (this.entitlementService.entitlement === ChatEntitlement.Limited ? 5 : 15);
+                const defaultValue = value ?? (this.entitlementService.entitlement === ChatEntitlement.Free ? 25 : 25);
                 const node = {
                     id: 'chatSidebar',
-                    title: ( localize(4531, "Chat")),
+                    title: ( localize(4570, "Chat")),
                     type: 'object',
                     properties: {
                         'chat.agent.maxRequests': {
                             type: 'number',
                             markdownDescription: ( localize(
-                                4572,
-                                "The maximum number of requests to allow Copilot Edits to use per-turn in agent mode. When the limit is reached, Copilot will ask the user to confirm that it should keep working."
+                                4622,
+                                "The maximum number of requests to allow Copilot to use per-turn in agent mode. When the limit is reached, Copilot will ask the user to confirm that it should continue."
                             )),
                             default: defaultValue,
                         },
@@ -515,7 +618,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
         super();
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'clear',
-            detail: ( localize(4573, "Start a new chat")),
+            detail: ( localize(4623, "Start a new chat")),
             sortText: 'z2_clear',
             executeImmediately: true,
             locations: [ChatAgentLocation.Panel]
@@ -524,7 +627,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: SAVE_TO_PROMPT_SLASH_COMMAND_NAME,
-            detail: ( localize(4574, "Save chat to a prompt file")),
+            detail: ( localize(4624, "Save chat to a prompt file")),
             sortText: `z3_${SAVE_TO_PROMPT_SLASH_COMMAND_NAME}`,
             executeImmediately: true,
             silent: true,
@@ -576,7 +679,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                     progress.report({ content: ( new MarkdownString(defaultAgent.metadata.helpTextVariablesPrefix)), kind: 'markdownContent' });
                 }
                 const variables = [
-                    { name: 'file', description: ( localize(4575, "Choose a file in the workspace")) }
+                    { name: 'file', description: ( localize(4625, "Choose a file in the workspace")) }
                 ];
                 const variableText = ( variables
                     .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`))
@@ -624,6 +727,8 @@ registerWorkbenchContribution2(ChatEditingEditorOverlay.ID, ChatEditingEditorOve
 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);
 registerChatActions();
 registerChatCopyActions();
 registerChatCodeBlockActions();
@@ -642,3 +747,5 @@ registerChatToolActions();
 registerEditorFeature(ChatPasteProvidersFeature);
 registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);
 registerPromptFileContributions();
+registerWorkbenchContribution2(UserToolSetsContributions.ID, UserToolSetsContributions, WorkbenchPhase.Eventually);
+registerAction2(ConfigureToolSets);

package/vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.d.ts

@@ -2,7 +2,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatResponseViewModel } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export declare class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
     private readonly _accessibilitySignalService;