@codingame/monaco-vscode-chat-service-override 15.0.2 → 16.0.0

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

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 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';
@@ -14,36 +15,45 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 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 product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { PromptsConfig } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/config';
+import { DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/constants';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-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-2b1a9082-790f-527f-b013-d1b29d6265a3-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 { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { mcpDiscoverySection, allDiscoverySources, discoverySourceLabel, mcpConfigurationSection, mcpSchemaExampleServers, mcpEnabledSection } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatColors';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatEntitlement } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import '../common/chatServiceImpl.js';
 import '../common/chatSlashCommands.js';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
+import '../common/chatTransferService.js';
 import { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/languageModelStats';
+import { DOCUMENTATION_URL } from '../common/promptSyntax/constants.js';
+import '../common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.js';
 import '../common/promptSyntax/languageFeatures/promptLinkProvider.js';
 import '../common/promptSyntax/languageFeatures/promptPathAutocompletion.js';
 import '../common/promptSyntax/service/promptsService.js';
-import './promptSyntax/contributions/usePromptCommand.js';
-import './promptSyntax/contributions/createPromptCommand/createPromptCommand.js';
 import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
-import { BuiltinToolsContribution } from '../common/tools/tools.js';
+import { BuiltinToolsContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/tools';
 import '../common/voiceChatService.js';
-import { PanelChatAccessibilityHelp, QuickChatAccessibilityHelp, EditsChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
+import { PanelChatAccessibilityHelp, QuickChatAccessibilityHelp, EditsChatAccessibilityHelp, AgentChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
 import { CopilotTitleBarMenuRendering, registerChatActions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ACTION_ID_NEW_CHAT, registerNewChatActions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClearActions';
 import { CodeBlockActionRendering, registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from './actions/chatCodeblockActions.js';
@@ -57,72 +67,70 @@ import { registerChatExportActions } from './actions/chatImportExport.js';
 import { registerMoveActions } from './actions/chatMoveActions.js';
 import { registerQuickChatActions } from './actions/chatQuickInputActions.js';
 import { registerChatTitleActions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
+import { registerChatToolActions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatToolActions';
+import { ChatTransferContribution } from './actions/chatTransfer.js';
 import './chatAccessibilityService.js';
 import '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatAttachmentModel';
 import '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { ChatInputBoxContentProvider } from './chatEdinputInputContentProvider.js';
 import { ChatEditingEditorAccessibility } from './chatEditing/chatEditingEditorAccessibility.js';
-import { registerChatEditorActions } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions';
+import { registerChatEditorActions } from './chatEditing/chatEditingEditorActions.js';
+import { ChatEditingEditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
 import { ChatEditingEditorOverlay } from './chatEditing/chatEditingEditorOverlay.js';
 import './chatEditing/chatEditingServiceImpl.js';
+import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
 import { ChatEditor } from './chatEditor.js';
 import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
 import { ChatExtensionPointHandler, ChatCompatibilityNotifier } from './chatParticipant.contribution.js';
-import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
+import { ChatPasteProvidersFeature } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatPasteProviders';
 import './chatQuick.js';
-import '../common/chatQuotasService.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
 import { ChatSetupContribution } from './chatSetup.js';
+import { ChatStatusBarEntry } from './chatStatus.js';
 import './chatVariables.js';
 import '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatImplicitContextContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext';
-import '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions';
+import '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions';
 import './contrib/chatInputEditorContrib.js';
 import './contrib/chatInputEditorHover.js';
-import { ChatRelatedFilesContribution } from './contrib/chatInputRelatedFilesContrib.js';
+import { ChatRelatedFilesContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib';
 import './languageModelToolsService.js';
+import './promptSyntax/contributions/createPromptCommand/createPromptCommand.js';
+import './promptSyntax/contributions/usePromptCommand.js';
 import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
-import { ChatEditingEditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
-import { PromptsConfig } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/config';
-import { PROMPT_FILE_EXTENSION } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/constants';
-import { DOCUMENTATION_URL } from '../common/promptSyntax/constants.js';
-import { registerChatToolActions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatToolActions';
-import { ChatStatusBarEntry } from './chatStatus.js';
-import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
-import { ChatEditingNotebookFileSystemProviderContrib } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookFileSystemProvider';
 
 const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'chatSidebar',
-    title: ( localize(4430, "Chat")),
+    title: ( localize(4499, "Chat")),
     type: 'object',
     properties: {
         'chat.editor.fontSize': {
             type: 'number',
-            description: ( localize(4431, "Controls the font size in pixels in chat codeblocks.")),
+            description: ( localize(4500, "Controls the font size in pixels in chat codeblocks.")),
             default: isMacintosh ? 12 : 14,
         },
         'chat.editor.fontFamily': {
             type: 'string',
-            description: ( localize(4432, "Controls the font family in chat codeblocks.")),
+            description: ( localize(4501, "Controls the font family in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.fontWeight': {
             type: 'string',
-            description: ( localize(4433, "Controls the font weight in chat codeblocks.")),
+            description: ( localize(4502, "Controls the font weight in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.wordWrap': {
             type: 'string',
-            description: ( localize(4434, "Controls whether lines should wrap in chat codeblocks.")),
+            description: ( localize(4503, "Controls whether lines should wrap in chat codeblocks.")),
             default: 'off',
             enum: ['on', 'off']
         },
         'chat.editor.lineHeight': {
             type: 'number',
             description: ( localize(
-                4435,
+                4504,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
@@ -130,7 +138,7 @@ configurationRegistry.registerConfiguration({
         'chat.commandCenter.enabled': {
             type: 'boolean',
             markdownDescription: ( localize(
-                4436,
+                4505,
                 "Controls whether the command center shows a menu for actions to control Copilot (requires {0}).",
                 '`#window.commandCenter#`'
             )),
@@ -140,17 +148,17 @@ configurationRegistry.registerConfiguration({
             type: 'object',
             tags: ['experimental'],
             description: ( localize(
-                4437,
+                4506,
                 "Enables automatically using the active editor as chat context for specified chat locations."
             )),
             additionalProperties: {
                 type: 'string',
                 enum: ['never', 'first', 'always'],
-                description: ( localize(4438, "The value for the implicit context.")),
+                description: ( localize(4507, "The value for the implicit context.")),
                 enumDescriptions: [
-                    ( localize(4439, "Implicit context is never enabled.")),
-                    ( localize(4440, "Implicit context is enabled for the first interaction.")),
-                    ( localize(4441, "Implicit context is always enabled."))
+                    ( localize(4508, "Implicit context is never enabled.")),
+                    ( localize(4509, "Implicit context is enabled for the first interaction.")),
+                    ( localize(4510, "Implicit context is always enabled."))
                 ]
             },
             default: {
@@ -161,7 +169,7 @@ configurationRegistry.registerConfiguration({
         'chat.editing.autoAcceptDelay': {
             type: 'number',
             markdownDescription: ( localize(
-                4442,
+                4511,
                 "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,
@@ -172,7 +180,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4443,
+                4512,
                 "Whether to show a confirmation before removing a request and its associated edits."
             )),
             default: true,
@@ -181,7 +189,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4444,
+                4513,
                 "Whether to show a confirmation before retrying a request and its associated edits."
             )),
             default: true,
@@ -189,39 +197,149 @@ configurationRegistry.registerConfiguration({
         'chat.experimental.detectParticipant.enabled': {
             type: 'boolean',
             deprecationMessage: ( localize(
-                4445,
+                4514,
                 "This setting is deprecated. Please use `chat.detectParticipant.enabled` instead."
             )),
-            description: ( localize(4446, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4515, "Enables chat participant autodetection for panel chat.")),
             default: null
         },
         'chat.detectParticipant.enabled': {
             type: 'boolean',
-            description: ( localize(4447, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4516, "Enables chat participant autodetection for panel chat.")),
             default: true
         },
         'chat.renderRelatedFiles': {
             type: 'boolean',
             description: ( localize(
-                4448,
+                4517,
                 "Controls whether related files should be rendered in the chat input."
             )),
             default: false
         },
-        'chat.experimental.statusIndicator.enabled': {
+        'chat.setupFromDialog': {
             type: 'boolean',
             description: ( localize(
-                4449,
-                "Controls whether a Copilot related status indicator appears in the lower right corner."
+                4518,
+                "Controls whether Copilot setup starts from a dialog or from the welcome view."
             )),
             default: product.quality !== 'stable',
             tags: ['experimental', 'onExp']
         },
-        [PromptsConfig.CONFIG_KEY]: {
+        'chat.focusWindowOnConfirmation': {
+            type: 'boolean',
+            description: ( localize(
+                4519,
+                "Controls whether the Copilot window should be focused when a confirmation is needed."
+            )),
+            default: true,
+        },
+        'chat.tools.autoApprove': {
+            default: false,
+            description: ( localize(
+                4520,
+                "Controls whether tool use should be automatically approved ('YOLO mode')."
+            )),
+            type: 'boolean',
+            tags: ['experimental'],
+            policy: {
+                name: 'ChatToolsAutoApprove',
+                minimumVersion: '1.99',
+                previewFeature: true,
+                defaultValue: false
+            }
+        },
+        [mcpEnabledSection]: {
+            type: 'boolean',
+            description: ( localize(
+                4521,
+                "Enables integration with Model Context Protocol servers to provide additional tools and functionality."
+            )),
+            default: true,
+            tags: ['preview'],
+            policy: {
+                name: 'ChatMCP',
+                minimumVersion: '1.99',
+                previewFeature: true,
+                defaultValue: false
+            }
+        },
+        [mcpConfigurationSection]: {
+            type: 'object',
+            default: {
+                inputs: [],
+                servers: mcpSchemaExampleServers,
+            },
+            description: ( localize(4522, "Model Context Protocol server configurations")),
+            $ref: mcpSchemaId
+        },
+        [ChatConfiguration.UnifiedChatView]: {
+            type: 'boolean',
+            description: ( localize(
+                4523,
+                "Enables the unified view with Ask, Edit, and Agent modes in one view."
+            )),
+            default: true,
+            tags: ['preview'],
+        },
+        [ChatConfiguration.UseFileStorage]: {
+            type: 'boolean',
+            description: ( localize(
+                4524,
+                "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,
+            tags: ['experimental'],
+        },
+        [ChatConfiguration.Edits2Enabled]: {
+            type: 'boolean',
+            description: ( localize(
+                4525,
+                "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,
+            tags: ['onExp'],
+        },
+        [ChatConfiguration.ExtensionToolsEnabled]: {
+            type: 'boolean',
+            description: ( localize(
+                4526,
+                "Enable using tools contributed by third-party extensions in Copilot Chat agent mode."
+            )),
+            default: true,
+            policy: {
+                name: 'ChatAgentExtensionTools',
+                minimumVersion: '1.99',
+                description: ( localize(
+                    4527,
+                    "Enable using tools contributed by third-party extensions in Copilot Chat agent mode."
+                )),
+                previewFeature: true,
+                defaultValue: false
+            }
+        },
+        [mcpDiscoverySection]: {
+            oneOf: [
+                { type: 'boolean' },
+                {
+                    type: 'object',
+                    default: Object.fromEntries(( allDiscoverySources.map(k => [k, true]))),
+                    properties: Object.fromEntries(( allDiscoverySources.map(k => [
+                        k,
+                        { type: 'boolean', description: ( localize(4528, "Enables discovery of {0} servers", discoverySourceLabel[k])) }
+                    ]))),
+                }
+            ],
+            default: true,
+            markdownDescription: ( localize(
+                4529,
+                "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."
+            )),
+        },
+        [PromptsConfig.KEY]: {
             type: 'boolean',
-            title: ( localize(4450, "Prompt Files")),
+            title: ( localize(4530, "Prompt Files")),
             markdownDescription: ( localize(
-                4451,
+                4531,
                 "Enable reusable prompt files (`*{0}`) in Chat, Edits, and Inline Chat sessions. [Learn More]({1}).",
                 PROMPT_FILE_EXTENSION,
                 DOCUMENTATION_URL
@@ -230,38 +348,46 @@ configurationRegistry.registerConfiguration({
             restricted: true,
             disallowConfigurationDefault: true,
             tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
+            policy: {
+                name: 'ChatPromptFiles',
+                minimumVersion: '1.99',
+                description: ( localize(
+                    4532,
+                    "Enables reusable prompt files in Chat, Edits, and Inline Chat sessions."
+                )),
+                previewFeature: true,
+                defaultValue: false
+            }
         },
-        [PromptsConfig.LOCATIONS_CONFIG_KEY]: {
+        [PromptsConfig.LOCATIONS_KEY]: {
             type: 'object',
-            title: ( localize(4452, "Prompt File Locations")),
+            title: ( localize(4533, "Prompt File Locations")),
             markdownDescription: ( localize(
-                4453,
+                4534,
                 "Specify location(s) of reusable prompt 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.",
                 PROMPT_FILE_EXTENSION,
                 DOCUMENTATION_URL
             )),
             default: {
-                [PromptsConfig.DEFAULT_SOURCE_FOLDER]: true,
+                [DEFAULT_SOURCE_FOLDER]: true,
             },
-            required: [PromptsConfig.DEFAULT_SOURCE_FOLDER],
             additionalProperties: { type: 'boolean' },
             unevaluatedProperties: { type: 'boolean' },
             restricted: true,
-            disallowConfigurationDefault: true,
             tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
             examples: [
                 {
-                    [PromptsConfig.DEFAULT_SOURCE_FOLDER]: true,
+                    [DEFAULT_SOURCE_FOLDER]: true,
                 },
                 {
-                    [PromptsConfig.DEFAULT_SOURCE_FOLDER]: true,
+                    [DEFAULT_SOURCE_FOLDER]: true,
                     '/Users/vscode/repos/prompts': true,
                 },
             ],
         },
     }
 });
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4454, "Chat"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4535, "Chat"))), [
     ( new SyncDescriptor(ChatEditorInput))
 ]);
 ( Registry.as(Extensions$1.ConfigurationMigration)).registerConfigurationMigrations([
@@ -279,7 +405,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         super();
         this._register(editorResolverService.registerEditor(`${Schemas.vscodeChatSesssion}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localize(4454, "Chat")),
+            label: ( localize(4535, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
@@ -295,47 +421,56 @@ ChatResolverContribution = ( __decorate([
     ( __param(0, IEditorResolverService)),
     ( __param(1, IInstantiationService))
 ], ChatResolverContribution));
-let ChatAgentSettingContribution = class ChatAgentSettingContribution {
+let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatAgentSetting'; }
-    constructor(experimentService, productService, contextKeyService) {
+    constructor(experimentService, productService, contextKeyService, entitlementService) {
+        super();
+        this.experimentService = experimentService;
         this.productService = productService;
+        this.entitlementService = entitlementService;
         if (this.productService.quality !== 'stable') {
-            this.registerSetting();
+            this.registerEnablementSetting();
         }
         const expDisabledKey = ChatContextKeys.Editing.agentModeDisallowed.bindTo(contextKeyService);
         experimentService.getTreatment('chatAgentEnabled').then(enabled => {
-            if (enabled) {
-                this.registerSetting();
+            if (enabled || typeof enabled !== 'boolean') {
+                this.registerEnablementSetting();
                 expDisabledKey.set(false);
             }
-            else if (enabled === false) {
+            else {
                 this.deregisterSetting();
                 expDisabledKey.set(true);
             }
         });
+        this.registerMaxRequestsSetting();
     }
-    registerSetting() {
+    registerEnablementSetting() {
         if (this.registeredNode) {
             return;
         }
-        this.registeredNode = {
+        this.registeredNode = configurationRegistry.registerConfiguration({
             id: 'chatAgent',
-            title: ( localize(4430, "Chat")),
+            title: ( localize(4499, "Chat")),
             type: 'object',
             properties: {
-                'chat.agent.enabled': {
+                [ChatConfiguration.AgentEnabled]: {
                     type: 'boolean',
                     description: ( localize(
-                        4455,
-                        "Enable agent mode for {0}. When this is enabled, a dropdown appears in the {0} view to toggle agent mode.",
-                        'Copilot Edits'
+                        4536,
+                        "Enable agent mode for {0}. When this is enabled, a dropdown appears in the view to toggle agent mode.",
+                        'Copilot Chat'
                     )),
                     default: this.productService.quality !== 'stable',
-                    tags: ['experimental', 'onExp'],
+                    tags: ['onExp'],
+                    policy: {
+                        name: 'ChatAgentMode',
+                        minimumVersion: '1.99',
+                        previewFeature: false,
+                        defaultValue: false
+                    }
                 },
             }
-        };
-        configurationRegistry.registerConfiguration(this.registeredNode);
+        });
     }
     deregisterSetting() {
         if (this.registeredNode) {
@@ -343,16 +478,47 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution {
             this.registeredNode = undefined;
         }
     }
+    registerMaxRequestsSetting() {
+        let lastNode;
+        const registerMaxRequestsSetting = () => {
+            const treatmentId = this.entitlementService.entitlement === ChatEntitlement.Limited ?
+                'chatAgentMaxRequestsFree' :
+                'chatAgentMaxRequestsPro';
+            this.experimentService.getTreatment(treatmentId).then(value => {
+                const defaultValue = value ?? (this.entitlementService.entitlement === ChatEntitlement.Limited ? 5 : 15);
+                const node = {
+                    id: 'chatSidebar',
+                    title: ( localize(4499, "Chat")),
+                    type: 'object',
+                    properties: {
+                        'chat.agent.maxRequests': {
+                            type: 'number',
+                            markdownDescription: ( localize(
+                                4537,
+                                "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. \n\n> **Note**: For users on the Copilot Free plan, note that each agent mode request currently uses one chat request."
+                            )),
+                            default: defaultValue,
+                        },
+                    }
+                };
+                configurationRegistry.updateConfigurations({ remove: lastNode ? [lastNode] : [], add: [node] });
+                lastNode = node;
+            });
+        };
+        this._register(Event.runAndSubscribe(Event.debounce(this.entitlementService.onDidChangeEntitlement, () => { }, 1000), () => registerMaxRequestsSetting()));
+    }
 };
 ChatAgentSettingContribution = ( __decorate([
     ( __param(0, IWorkbenchAssignmentService)),
     ( __param(1, IProductService)),
-    ( __param(2, IContextKeyService))
+    ( __param(2, IContextKeyService)),
+    ( __param(3, IChatEntitlementService))
 ], ChatAgentSettingContribution));
 AccessibleViewRegistry.register(( new ChatResponseAccessibleView()));
 AccessibleViewRegistry.register(( new PanelChatAccessibilityHelp()));
 AccessibleViewRegistry.register(( new QuickChatAccessibilityHelp()));
 AccessibleViewRegistry.register(( new EditsChatAccessibilityHelp()));
+AccessibleViewRegistry.register(( new AgentChatAccessibilityHelp()));
 registerEditorFeature(ChatInputBoxContentProvider);
 let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommandsContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatSlashStaticSlashCommands'; }
@@ -360,7 +526,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
         super();
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'clear',
-            detail: ( localize(4456, "Start a new chat")),
+            detail: ( localize(4538, "Start a new chat")),
             sortText: 'z2_clear',
             executeImmediately: true,
             locations: [ChatAgentLocation.Panel]
@@ -372,7 +538,8 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
             detail: '',
             sortText: 'z1_help',
             executeImmediately: true,
-            locations: [ChatAgentLocation.Panel]
+            locations: [ChatAgentLocation.Panel],
+            modes: [ChatMode.Ask]
         }, async (prompt, progress) => {
             const defaultAgent = chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
             const agents = chatAgentService.getAgents();
@@ -386,7 +553,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                 progress.report({ content: ( new MarkdownString('\n\n')), kind: 'markdownContent' });
             }
             const agentText = (await Promise.all(( agents
-                .filter(a => a.id !== defaultAgent?.id)
+                .filter(a => a.id !== defaultAgent?.id && !a.isCore)
                 .filter(a => a.locations.includes(ChatAgentLocation.Panel))
                 .map(async (a) => {
                 const description = a.description ? `- ${a.description}` : '';
@@ -408,7 +575,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                     progress.report({ content: ( new MarkdownString(defaultAgent.metadata.helpTextVariablesPrefix)), kind: 'markdownContent' });
                 }
                 const variables = [
-                    { name: 'file', description: ( localize(4457, "Choose a file in the workspace")) }
+                    { name: 'file', description: ( localize(4539, "Choose a file in the workspace")) }
                 ];
                 const variableText = ( variables
                     .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`))
@@ -454,6 +621,7 @@ registerWorkbenchContribution2(ChatAgentSettingContribution.ID, ChatAgentSetting
 registerWorkbenchContribution2(ChatEditingEditorAccessibility.ID, ChatEditingEditorAccessibility, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(ChatEditingEditorOverlay.ID, ChatEditingEditorOverlay, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(ChatEditingEditorContextKeys.ID, ChatEditingEditorContextKeys, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(ChatTransferContribution.ID, ChatTransferContribution, WorkbenchPhase.BlockRestore);
 registerChatActions();
 registerChatCopyActions();
 registerChatCodeBlockActions();

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

@@ -0,0 +1,4 @@
+import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IModifiedFileEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+export declare function isTextDiffEditorForEntry(accessor: ServicesAccessor, entry: IModifiedFileEntry, editor: ICodeEditor): boolean;

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

@@ -0,0 +1,15 @@
+
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { findDiffEditorContainingCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/diffEditor/commands';
+
+function isTextDiffEditorForEntry(accessor, entry, editor) {
+    const diffEditor = findDiffEditorContainingCodeEditor(accessor, editor);
+    if (!diffEditor) {
+        return false;
+    }
+    const originalModel = diffEditor.getOriginalEditor().getModel();
+    const modifiedModel = diffEditor.getModifiedEditor().getModel();
+    return isEqual(originalModel?.uri, entry.originalURI) && isEqual(modifiedModel?.uri, entry.modifiedURI);
+}
+
+export { isTextDiffEditorForEntry };