@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

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

@@ -6,71 +6,67 @@ import { isMarkdownString, MarkdownString } from '@codingame/monaco-vscode-api/v
 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 { 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';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { Extensions, ConfigurationScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
-import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 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 { 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 { 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 { EditorPaneDescriptor } from '@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-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 { mcpSchemaId } from '@codingame/monaco-vscode-4a0e04a7-c3bd-5fb7-9d3b-4fd047cc9e59-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-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 { mcpDiscoverySection, allDiscoverySources, discoverySourceLabel, mcpConfigurationSection, mcpSchemaExampleServers, mcpEnabledSection } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-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-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 '@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 { 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 { chatVariableLeader } from '@codingame/monaco-vscode-api/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 '@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-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 '@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 { 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 '../common/voiceChatService.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 { 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 { CodeBlockActionRendering, registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from './actions/chatCodeblockActions.js';
 import { registerChatContextActions } from './actions/chatContextActions.js';
 import { registerChatCopyActions } from './actions/chatCopyActions.js';
 import { registerChatDeveloperActions } from './actions/chatDeveloperActions.js';
-import { ChatSubmitAction, registerChatExecuteActions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
+import { ChatSubmitAction, registerChatExecuteActions } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { registerChatFileTreeActions } from './actions/chatFileTreeActions.js';
 import { ChatGettingStartedContribution } from './actions/chatGettingStarted.js';
 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 { 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 { 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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatAttachmentModel';
+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 { ChatInputBoxContentProvider } from './chatEdinputInputContentProvider.js';
 import { ChatEditingEditorAccessibility } from './chatEditing/chatEditingEditorAccessibility.js';
@@ -79,58 +75,59 @@ import { ChatEditingEditorContextKeys } from '@codingame/monaco-vscode-api/vscod
 import { ChatEditingEditorOverlay } from './chatEditing/chatEditingEditorOverlay.js';
 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-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 { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatPasteProviders';
+import { ChatPasteProvidersFeature } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatPasteProviders';
 import './chatQuick.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-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions';
+import '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { ChatImplicitContextContribution } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext';
+import '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions';
 import './contrib/chatInputEditorContrib.js';
 import './contrib/chatInputEditorHover.js';
-import { ChatRelatedFilesContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib';
+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 './promptSyntax/contributions/usePromptCommand.js';
 import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
 
 const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'chatSidebar',
-    title: ( localize(4499, "Chat")),
+    title: ( localize(4531, "Chat")),
     type: 'object',
     properties: {
         'chat.editor.fontSize': {
             type: 'number',
-            description: ( localize(4500, "Controls the font size in pixels in chat codeblocks.")),
+            description: ( localize(4532, "Controls the font size in pixels in chat codeblocks.")),
             default: isMacintosh ? 12 : 14,
         },
         'chat.editor.fontFamily': {
             type: 'string',
-            description: ( localize(4501, "Controls the font family in chat codeblocks.")),
+            description: ( localize(4533, "Controls the font family in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.fontWeight': {
             type: 'string',
-            description: ( localize(4502, "Controls the font weight in chat codeblocks.")),
+            description: ( localize(4534, "Controls the font weight in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.wordWrap': {
             type: 'string',
-            description: ( localize(4503, "Controls whether lines should wrap in chat codeblocks.")),
+            description: ( localize(4535, "Controls whether lines should wrap in chat codeblocks.")),
             default: 'off',
             enum: ['on', 'off']
         },
         'chat.editor.lineHeight': {
             type: 'number',
             description: ( localize(
-                4504,
+                4536,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
@@ -138,7 +135,7 @@ configurationRegistry.registerConfiguration({
         'chat.commandCenter.enabled': {
             type: 'boolean',
             markdownDescription: ( localize(
-                4505,
+                4537,
                 "Controls whether the command center shows a menu for actions to control Copilot (requires {0}).",
                 '`#window.commandCenter#`'
             )),
@@ -148,28 +145,27 @@ configurationRegistry.registerConfiguration({
             type: 'object',
             tags: ['experimental'],
             description: ( localize(
-                4506,
+                4538,
                 "Enables automatically using the active editor as chat context for specified chat locations."
             )),
             additionalProperties: {
                 type: 'string',
                 enum: ['never', 'first', 'always'],
-                description: ( localize(4507, "The value for the implicit context.")),
+                description: ( localize(4539, "The value for the implicit context.")),
                 enumDescriptions: [
-                    ( localize(4508, "Implicit context is never enabled.")),
-                    ( localize(4509, "Implicit context is enabled for the first interaction.")),
-                    ( localize(4510, "Implicit context is always enabled."))
+                    ( localize(4540, "Implicit context is never enabled.")),
+                    ( localize(4541, "Implicit context is enabled for the first interaction.")),
+                    ( localize(4542, "Implicit context is always enabled."))
                 ]
             },
             default: {
                 'panel': 'always',
-                'editing-session': 'first'
             }
         },
         'chat.editing.autoAcceptDelay': {
             type: 'number',
             markdownDescription: ( localize(
-                4511,
+                4543,
                 "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,
@@ -180,7 +176,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4512,
+                4544,
                 "Whether to show a confirmation before removing a request and its associated edits."
             )),
             default: true,
@@ -189,7 +185,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4513,
+                4545,
                 "Whether to show a confirmation before retrying a request and its associated edits."
             )),
             default: true,
@@ -197,48 +193,36 @@ configurationRegistry.registerConfiguration({
         'chat.experimental.detectParticipant.enabled': {
             type: 'boolean',
             deprecationMessage: ( localize(
-                4514,
+                4546,
                 "This setting is deprecated. Please use `chat.detectParticipant.enabled` instead."
             )),
-            description: ( localize(4515, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4547, "Enables chat participant autodetection for panel chat.")),
             default: null
         },
         'chat.detectParticipant.enabled': {
             type: 'boolean',
-            description: ( localize(4516, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4548, "Enables chat participant autodetection for panel chat.")),
             default: true
         },
         'chat.renderRelatedFiles': {
             type: 'boolean',
             description: ( localize(
-                4517,
+                4549,
                 "Controls whether related files should be rendered in the chat input."
             )),
             default: false
         },
-        'chat.setupFromDialog': {
-            type: 'boolean',
-            description: ( localize(
-                4518,
-                "Controls whether Copilot setup starts from a dialog or from the welcome view."
-            )),
-            default: product.quality !== 'stable',
-            tags: ['experimental', 'onExp']
-        },
         'chat.focusWindowOnConfirmation': {
             type: 'boolean',
             description: ( localize(
-                4519,
+                4550,
                 "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')."
-            )),
+            description: ( localize(4551, "Controls whether tool use should be automatically approved.")),
             type: 'boolean',
             tags: ['experimental'],
             policy: {
@@ -248,10 +232,39 @@ configurationRegistry.registerConfiguration({
                 defaultValue: false
             }
         },
+        'chat.sendElementsToChat.enabled': {
+            default: true,
+            description: ( localize(
+                4552,
+                "Controls whether elements can be sent to chat from the Simple Browser."
+            )),
+            type: 'boolean',
+            tags: ['experimental']
+        },
+        'chat.sendElementsToChat.attachCSS': {
+            default: true,
+            markdownDescription: ( localize(
+                4553,
+                "Controls whether CSS of the selected element will be added to the chat. {0} must be enabled.",
+                '`#chat.sendElementsToChat.enabled#`'
+            )),
+            type: 'boolean',
+            tags: ['experimental']
+        },
+        'chat.sendElementsToChat.attachImages': {
+            default: true,
+            markdownDescription: ( localize(
+                4554,
+                "Controls whether a screenshot of the selected element will be added to the chat. {0} must be enabled.",
+                '`#chat.sendElementsToChat.enabled#`'
+            )),
+            type: 'boolean',
+            tags: ['experimental']
+        },
         [mcpEnabledSection]: {
             type: 'boolean',
             description: ( localize(
-                4521,
+                4555,
                 "Enables integration with Model Context Protocol servers to provide additional tools and functionality."
             )),
             default: true,
@@ -269,22 +282,13 @@ configurationRegistry.registerConfiguration({
                 inputs: [],
                 servers: mcpSchemaExampleServers,
             },
-            description: ( localize(4522, "Model Context Protocol server configurations")),
+            description: ( localize(4556, "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,
+                4557,
                 "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,
@@ -293,7 +297,7 @@ configurationRegistry.registerConfiguration({
         [ChatConfiguration.Edits2Enabled]: {
             type: 'boolean',
             description: ( localize(
-                4525,
+                4558,
                 "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,
@@ -301,22 +305,32 @@ configurationRegistry.registerConfiguration({
         },
         [ChatConfiguration.ExtensionToolsEnabled]: {
             type: 'boolean',
-            description: ( localize(
-                4526,
-                "Enable using tools contributed by third-party extensions in Copilot Chat agent mode."
-            )),
+            description: ( localize(4559, "Enable using tools contributed by third-party extensions.")),
             default: true,
             policy: {
                 name: 'ChatAgentExtensionTools',
                 minimumVersion: '1.99',
-                description: ( localize(
-                    4527,
-                    "Enable using tools contributed by third-party extensions in Copilot Chat agent mode."
-                )),
+                description: ( localize(4560, "Enable using tools contributed by third-party extensions.")),
                 previewFeature: true,
                 defaultValue: false
             }
         },
+        [ChatConfiguration.AgentEnabled]: {
+            type: 'boolean',
+            description: ( localize(
+                4561,
+                "Enable agent mode for {0}. When this is enabled, agent mode can be activated via the dropdown in the view.",
+                'Copilot Chat'
+            )),
+            default: true,
+            tags: ['onExp'],
+            policy: {
+                name: 'ChatAgentMode',
+                minimumVersion: '1.99',
+                previewFeature: false,
+                defaultValue: false
+            }
+        },
         [mcpDiscoverySection]: {
             oneOf: [
                 { type: 'boolean' },
@@ -325,24 +339,25 @@ configurationRegistry.registerConfiguration({
                     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])) }
+                        { type: 'boolean', description: ( localize(4562, "Enables discovery of {0} servers", discoverySourceLabel[k])) }
                     ]))),
                 }
             ],
             default: true,
             markdownDescription: ( localize(
-                4529,
+                4563,
                 "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(4530, "Prompt Files")),
+            title: ( localize(4564, "Prompt Files")),
             markdownDescription: ( localize(
-                4531,
-                "Enable reusable prompt files (`*{0}`) in Chat, Edits, and Inline Chat sessions. [Learn More]({1}).",
+                4565,
+                "Enable reusable prompt (`*{0}`) and instruction files in Chat, Edits, and Inline Chat sessions. [Learn More]({1}).",
                 PROMPT_FILE_EXTENSION,
-                DOCUMENTATION_URL
+                INSTRUCTION_FILE_EXTENSION,
+                PROMPT_DOCUMENTATION_URL
             )),
             default: true,
             restricted: true,
@@ -352,24 +367,49 @@ configurationRegistry.registerConfiguration({
                 name: 'ChatPromptFiles',
                 minimumVersion: '1.99',
                 description: ( localize(
-                    4532,
-                    "Enables reusable prompt files in Chat, Edits, and Inline Chat sessions."
+                    4566,
+                    "Enables reusable prompt and instruction files in Chat, Edits, and Inline Chat sessions."
                 )),
                 previewFeature: true,
                 defaultValue: false
             }
         },
-        [PromptsConfig.LOCATIONS_KEY]: {
+        [PromptsConfig.INSTRUCTIONS_LOCATION_KEY]: {
+            type: 'object',
+            title: ( localize(4567, "Instructions File Locations")),
+            markdownDescription: ( localize(
+                4568,
+                "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
+            )),
+            default: {
+                [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true,
+            },
+            additionalProperties: { type: 'boolean' },
+            restricted: true,
+            tags: ['experimental', '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(4533, "Prompt File Locations")),
+            title: ( localize(4569, "Prompt File Locations")),
             markdownDescription: ( localize(
-                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.",
+                4570,
+                "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,
-                DOCUMENTATION_URL
+                PROMPT_DOCUMENTATION_URL
             )),
             default: {
-                [DEFAULT_SOURCE_FOLDER]: true,
+                [PROMPT_DEFAULT_SOURCE_FOLDER]: true,
             },
             additionalProperties: { type: 'boolean' },
             unevaluatedProperties: { type: 'boolean' },
@@ -377,17 +417,17 @@ configurationRegistry.registerConfiguration({
             tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
             examples: [
                 {
-                    [DEFAULT_SOURCE_FOLDER]: true,
+                    [PROMPT_DEFAULT_SOURCE_FOLDER]: true,
                 },
                 {
-                    [DEFAULT_SOURCE_FOLDER]: true,
+                    [PROMPT_DEFAULT_SOURCE_FOLDER]: true,
                     '/Users/vscode/repos/prompts': true,
                 },
             ],
         },
     }
 });
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4535, "Chat"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4571, "Chat"))), [
     ( new SyncDescriptor(ChatEditorInput))
 ]);
 ( Registry.as(Extensions$1.ConfigurationMigration)).registerConfigurationMigrations([
@@ -405,7 +445,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         super();
         this._register(editorResolverService.registerEditor(`${Schemas.vscodeChatSesssion}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localize(4535, "Chat")),
+            label: ( localize(4571, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
@@ -423,61 +463,12 @@ ChatResolverContribution = ( __decorate([
 ], ChatResolverContribution));
 let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatAgentSetting'; }
-    constructor(experimentService, productService, contextKeyService, entitlementService) {
+    constructor(experimentService, entitlementService) {
         super();
         this.experimentService = experimentService;
-        this.productService = productService;
         this.entitlementService = entitlementService;
-        if (this.productService.quality !== 'stable') {
-            this.registerEnablementSetting();
-        }
-        const expDisabledKey = ChatContextKeys.Editing.agentModeDisallowed.bindTo(contextKeyService);
-        experimentService.getTreatment('chatAgentEnabled').then(enabled => {
-            if (enabled || typeof enabled !== 'boolean') {
-                this.registerEnablementSetting();
-                expDisabledKey.set(false);
-            }
-            else {
-                this.deregisterSetting();
-                expDisabledKey.set(true);
-            }
-        });
         this.registerMaxRequestsSetting();
     }
-    registerEnablementSetting() {
-        if (this.registeredNode) {
-            return;
-        }
-        this.registeredNode = configurationRegistry.registerConfiguration({
-            id: 'chatAgent',
-            title: ( localize(4499, "Chat")),
-            type: 'object',
-            properties: {
-                [ChatConfiguration.AgentEnabled]: {
-                    type: 'boolean',
-                    description: ( localize(
-                        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: ['onExp'],
-                    policy: {
-                        name: 'ChatAgentMode',
-                        minimumVersion: '1.99',
-                        previewFeature: false,
-                        defaultValue: false
-                    }
-                },
-            }
-        });
-    }
-    deregisterSetting() {
-        if (this.registeredNode) {
-            configurationRegistry.deregisterConfigurations([this.registeredNode]);
-            this.registeredNode = undefined;
-        }
-    }
     registerMaxRequestsSetting() {
         let lastNode;
         const registerMaxRequestsSetting = () => {
@@ -488,14 +479,14 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Di
                 const defaultValue = value ?? (this.entitlementService.entitlement === ChatEntitlement.Limited ? 5 : 15);
                 const node = {
                     id: 'chatSidebar',
-                    title: ( localize(4499, "Chat")),
+                    title: ( localize(4531, "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."
+                                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."
                             )),
                             default: defaultValue,
                         },
@@ -510,9 +501,7 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution extends Di
 };
 ChatAgentSettingContribution = ( __decorate([
     ( __param(0, IWorkbenchAssignmentService)),
-    ( __param(1, IProductService)),
-    ( __param(2, IContextKeyService)),
-    ( __param(3, IChatEntitlementService))
+    ( __param(1, IChatEntitlementService))
 ], ChatAgentSettingContribution));
 AccessibleViewRegistry.register(( new ChatResponseAccessibleView()));
 AccessibleViewRegistry.register(( new PanelChatAccessibilityHelp()));
@@ -522,17 +511,29 @@ AccessibleViewRegistry.register(( new AgentChatAccessibilityHelp()));
 registerEditorFeature(ChatInputBoxContentProvider);
 let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommandsContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatSlashStaticSlashCommands'; }
-    constructor(slashCommandService, commandService, chatAgentService, chatVariablesService, instantiationService) {
+    constructor(slashCommandService, commandService, chatAgentService, chatWidgetService, instantiationService) {
         super();
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'clear',
-            detail: ( localize(4538, "Start a new chat")),
+            detail: ( localize(4573, "Start a new chat")),
             sortText: 'z2_clear',
             executeImmediately: true,
             locations: [ChatAgentLocation.Panel]
         }, async () => {
             commandService.executeCommand(ACTION_ID_NEW_CHAT);
         }));
+        this._store.add(slashCommandService.registerSlashCommand({
+            command: SAVE_TO_PROMPT_SLASH_COMMAND_NAME,
+            detail: ( localize(4574, "Save chat to a prompt file")),
+            sortText: `z3_${SAVE_TO_PROMPT_SLASH_COMMAND_NAME}`,
+            executeImmediately: true,
+            silent: true,
+            locations: [ChatAgentLocation.Panel]
+        }, async () => {
+            const { lastFocusedWidget } = chatWidgetService;
+            assertDefined(lastFocusedWidget, 'No currently active chat widget found.');
+            runSaveToPromptAction({ chat: lastFocusedWidget }, commandService);
+        }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'help',
             detail: '',
@@ -575,7 +576,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                     progress.report({ content: ( new MarkdownString(defaultAgent.metadata.helpTextVariablesPrefix)), kind: 'markdownContent' });
                 }
                 const variables = [
-                    { name: 'file', description: ( localize(4539, "Choose a file in the workspace")) }
+                    { name: 'file', description: ( localize(4575, "Choose a file in the workspace")) }
                 ];
                 const variableText = ( variables
                     .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`))
@@ -599,7 +600,7 @@ ChatSlashStaticSlashCommandsContribution = ( __decorate([
     ( __param(0, IChatSlashCommandService)),
     ( __param(1, ICommandService)),
     ( __param(2, IChatAgentService)),
-    ( __param(3, IChatVariablesService)),
+    ( __param(3, IChatWidgetService)),
     ( __param(4, IInstantiationService))
 ], ChatSlashStaticSlashCommandsContribution));
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
@@ -617,9 +618,10 @@ registerWorkbenchContribution2(ChatGettingStartedContribution.ID, ChatGettingSta
 registerWorkbenchContribution2(ChatSetupContribution.ID, ChatSetupContribution, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatStatusBarEntry.ID, ChatStatusBarEntry, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(BuiltinToolsContribution.ID, BuiltinToolsContribution, WorkbenchPhase.Eventually);
-registerWorkbenchContribution2(ChatAgentSettingContribution.ID, ChatAgentSettingContribution, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ChatAgentSettingContribution.ID, ChatAgentSettingContribution, WorkbenchPhase.AfterRestored);
 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);
 registerChatActions();
@@ -639,3 +641,4 @@ registerChatEditorActions();
 registerChatToolActions();
 registerEditorFeature(ChatPasteProvidersFeature);
 registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);
+registerPromptFileContributions();