@codingame/monaco-vscode-chat-service-override 14.0.6 → 15.0.0

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

@@ -5,114 +5,124 @@ 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 { registerEditorContribution, EditorContributionInstantiation } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 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 { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 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-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 { 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 { 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 { chatVariableLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+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 { 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 { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
-import '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService';
+import '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelStats';
+import '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/languageModelStats';
+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 '../common/voiceChatService.js';
 import { PanelChatAccessibilityHelp, QuickChatAccessibilityHelp, EditsChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
-import { ChatCommandCenterRendering, registerChatActions } from '@codingame/monaco-vscode-api/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 { 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';
 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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
+import { ChatSubmitAction, registerChatExecuteActions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
+import { registerChatTitleActions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
 import './chatAccessibilityService.js';
-import '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatAttachmentModel';
+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 './chatEditing/chatEditingService.js';
-import { ChatEditor } from './chatEditor.js';
-import { registerChatEditorActions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorActions';
-import { ChatEditorController } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorController';
-import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { ChatInputBoxContentProvider } from './chatEdinputInputContentProvider.js';
-import { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
+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 { ChatEditingEditorOverlay } from './chatEditing/chatEditingEditorOverlay.js';
+import './chatEditing/chatEditingServiceImpl.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 './chatQuick.js';
+import '../common/chatQuotasService.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
+import { ChatSetupContribution } from './chatSetup.js';
 import './chatVariables.js';
-import '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+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 './contrib/chatInputEditorContrib.js';
 import './contrib/chatInputEditorHover.js';
-import { ChatImplicitContextContribution } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext';
+import { ChatRelatedFilesContribution } from './contrib/chatInputRelatedFilesContrib.js';
 import './languageModelToolsService.js';
 import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
-import { ChatGettingStartedContribution } from './actions/chatGettingStarted.js';
-import { Extensions as Extensions$1 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/configuration';
-import { ChatRelatedFilesContribution } from './contrib/chatInputRelatedFilesContrib.js';
-import { ChatQuotasStatusBarEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatQuotasService';
-import { ChatSetupContribution } from './chatSetup.js';
-import { ChatEditorOverlayController } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorOverlay';
-import '../common/promptSyntax/languageFeatures/promptLinkProvider.js';
-import { PromptFilesConfig } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config';
-import { BuiltinToolsContribution } from '../common/tools/tools.js';
-import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
-import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+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(4386, "Chat")),
+    title: ( localize(4416, "Chat")),
     type: 'object',
     properties: {
         'chat.editor.fontSize': {
             type: 'number',
-            description: ( localize(4387, "Controls the font size in pixels in chat codeblocks.")),
+            description: ( localize(4417, "Controls the font size in pixels in chat codeblocks.")),
             default: isMacintosh ? 12 : 14,
         },
         'chat.editor.fontFamily': {
             type: 'string',
-            description: ( localize(4388, "Controls the font family in chat codeblocks.")),
+            description: ( localize(4418, "Controls the font family in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.fontWeight': {
             type: 'string',
-            description: ( localize(4389, "Controls the font weight in chat codeblocks.")),
+            description: ( localize(4419, "Controls the font weight in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.wordWrap': {
             type: 'string',
-            description: ( localize(4390, "Controls whether lines should wrap in chat codeblocks.")),
+            description: ( localize(4420, "Controls whether lines should wrap in chat codeblocks.")),
             default: 'off',
             enum: ['on', 'off']
         },
         'chat.editor.lineHeight': {
             type: 'number',
             description: ( localize(
-                4391,
+                4421,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
@@ -120,16 +130,38 @@ configurationRegistry.registerConfiguration({
         'chat.commandCenter.enabled': {
             type: 'boolean',
             markdownDescription: ( localize(
-                4392,
+                4422,
                 "Controls whether the command center shows a menu for actions to control Copilot (requires {0}).",
                 '`#window.commandCenter#`'
             )),
             default: true
         },
+        'chat.implicitContext.enabled': {
+            type: 'object',
+            tags: ['experimental'],
+            description: ( localize(
+                4423,
+                "Enables automatically using the active editor as chat context for specified chat locations."
+            )),
+            additionalProperties: {
+                type: 'string',
+                enum: ['never', 'first', 'always'],
+                description: ( localize(4424, "The value for the implicit context.")),
+                enumDescriptions: [
+                    ( localize(4425, "Implicit context is never enabled.")),
+                    ( localize(4426, "Implicit context is enabled for the first interaction.")),
+                    ( localize(4427, "Implicit context is always enabled."))
+                ]
+            },
+            default: {
+                'panel': 'always',
+                'editing-session': 'first'
+            }
+        },
         'chat.editing.autoAcceptDelay': {
             type: 'number',
             markdownDescription: ( localize(
-                4393,
+                4428,
                 "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,
@@ -140,7 +172,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4394,
+                4429,
                 "Whether to show a confirmation before removing a request and its associated edits."
             )),
             default: true,
@@ -149,7 +181,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                4395,
+                4430,
                 "Whether to show a confirmation before retrying a request and its associated edits."
             )),
             default: true,
@@ -157,32 +189,79 @@ configurationRegistry.registerConfiguration({
         'chat.experimental.detectParticipant.enabled': {
             type: 'boolean',
             deprecationMessage: ( localize(
-                4396,
+                4431,
                 "This setting is deprecated. Please use `chat.detectParticipant.enabled` instead."
             )),
-            description: ( localize(4397, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4432, "Enables chat participant autodetection for panel chat.")),
             default: null
         },
         'chat.detectParticipant.enabled': {
             type: 'boolean',
-            description: ( localize(4398, "Enables chat participant autodetection for panel chat.")),
+            description: ( localize(4433, "Enables chat participant autodetection for panel chat.")),
             default: true
         },
-        [PromptFilesConfig.CONFIG_KEY]: {
-            type: ['string', 'array', 'object', 'boolean', 'null'],
-            title: ( localize(4399, "Prompt Files")),
+        'chat.renderRelatedFiles': {
+            type: 'boolean',
+            description: ( localize(
+                4434,
+                "Controls whether related files should be rendered in the chat input."
+            )),
+            default: false
+        },
+        'chat.experimental.statusIndicator.enabled': {
+            type: 'boolean',
+            description: ( localize(
+                4435,
+                "Controls whether a Copilot related status indicator appears in the lower right corner."
+            )),
+            default: product.quality !== 'stable',
+            tags: ['experimental', 'onExp']
+        },
+        [PromptsConfig.CONFIG_KEY]: {
+            type: 'boolean',
+            title: ( localize(4436, "Prompt Files")),
             markdownDescription: ( localize(
-                4400,
-                "Enable support for attaching reusable prompt files (`*{0}`) for Chat, Edits, and Inline Chat sessions. [Learn More]({1}).",
-                '.prompt.md',
-                PromptFilesConfig.DOCUMENTATION_URL
+                4437,
+                "Enable reusable prompt files (`*{0}`) in Chat, Edits, and Inline Chat sessions. [Learn More]({1}).",
+                PROMPT_FILE_EXTENSION,
+                DOCUMENTATION_URL
             )),
-            default: null,
-            tags: ['experimental'],
+            default: true,
+            restricted: true,
+            disallowConfigurationDefault: true,
+            tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
+        },
+        [PromptsConfig.LOCATIONS_CONFIG_KEY]: {
+            type: 'object',
+            title: ( localize(4438, "Prompt File Locations")),
+            markdownDescription: ( localize(
+                4439,
+                "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,
+            },
+            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,
+                },
+                {
+                    [PromptsConfig.DEFAULT_SOURCE_FOLDER]: true,
+                    '/Users/vscode/repos/prompts': true,
+                },
+            ],
         },
     }
 });
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4401, "Chat"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4440, "Chat"))), [
     ( new SyncDescriptor(ChatEditorInput))
 ]);
 ( Registry.as(Extensions$1.ConfigurationMigration)).registerConfigurationMigrations([
@@ -200,7 +279,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         super();
         this._register(editorResolverService.registerEditor(`${Schemas.vscodeChatSesssion}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localize(4401, "Chat")),
+            label: ( localize(4440, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
@@ -224,14 +303,15 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution {
             this.registerSetting();
         }
         const expDisabledKey = ChatContextKeys.Editing.agentModeDisallowed.bindTo(contextKeyService);
-        experimentService.getTreatment('chatAgentEnabled').then(value => {
-            if (value) {
+        experimentService.getTreatment('chatAgentEnabled').then(enabled => {
+            if (enabled) {
                 this.registerSetting();
+                expDisabledKey.set(false);
             }
-            else if (value === false) {
+            else if (enabled === false) {
                 this.deregisterSetting();
+                expDisabledKey.set(true);
             }
-            expDisabledKey.set(!value);
         });
     }
     registerSetting() {
@@ -240,13 +320,13 @@ let ChatAgentSettingContribution = class ChatAgentSettingContribution {
         }
         this.registeredNode = {
             id: 'chatAgent',
-            title: ( localize(4386, "Chat")),
+            title: ( localize(4416, "Chat")),
             type: 'object',
             properties: {
                 'chat.agent.enabled': {
                     type: 'boolean',
                     description: ( localize(
-                        4402,
+                        4441,
                         "Enable agent mode for {0}. When this is enabled, a dropdown appears in the {0} view to toggle agent mode.",
                         'Copilot Edits'
                     )),
@@ -280,7 +360,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
         super();
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'clear',
-            detail: ( localize(4403, "Start a new chat")),
+            detail: ( localize(4442, "Start a new chat")),
             sortText: 'z2_clear',
             executeImmediately: true,
             locations: [ChatAgentLocation.Panel]
@@ -328,8 +408,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                     progress.report({ content: ( new MarkdownString(defaultAgent.metadata.helpTextVariablesPrefix)), kind: 'markdownContent' });
                 }
                 const variables = [
-                    ...chatVariablesService.getVariables(ChatAgentLocation.Panel),
-                    { name: 'file', description: ( localize(4404, "Choose a file in the workspace")) }
+                    { name: 'file', description: ( localize(4443, "Choose a file in the workspace")) }
                 ];
                 const variableText = ( variables
                     .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`))
@@ -362,16 +441,19 @@ registerWorkbenchContribution2(ChatSlashStaticSlashCommandsContribution.ID, Chat
 registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(LanguageModelToolsExtensionPointHandler.ID, LanguageModelToolsExtensionPointHandler, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatCompatibilityNotifier.ID, ChatCompatibilityNotifier, WorkbenchPhase.Eventually);
-registerWorkbenchContribution2(ChatCommandCenterRendering.ID, ChatCommandCenterRendering, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(CopilotTitleBarMenuRendering.ID, CopilotTitleBarMenuRendering, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(CodeBlockActionRendering.ID, CodeBlockActionRendering, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatImplicitContextContribution.ID, ChatImplicitContextContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(ChatRelatedFilesContribution.ID, ChatRelatedFilesContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(ChatViewsWelcomeHandler.ID, ChatViewsWelcomeHandler, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(ChatGettingStartedContribution.ID, ChatGettingStartedContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(ChatSetupContribution.ID, ChatSetupContribution, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(ChatQuotasStatusBarEntry.ID, ChatQuotasStatusBarEntry, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(ChatStatusBarEntry.ID, ChatStatusBarEntry, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(BuiltinToolsContribution.ID, BuiltinToolsContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(ChatAgentSettingContribution.ID, ChatAgentSettingContribution, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ChatEditingEditorAccessibility.ID, ChatEditingEditorAccessibility, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(ChatEditingEditorOverlay.ID, ChatEditingEditorOverlay, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(ChatEditingEditorContextKeys.ID, ChatEditingEditorContextKeys, WorkbenchPhase.AfterRestored);
 registerChatActions();
 registerChatCopyActions();
 registerChatCodeBlockActions();
@@ -386,6 +468,6 @@ registerNewChatActions();
 registerChatContextActions();
 registerChatDeveloperActions();
 registerChatEditorActions();
+registerChatToolActions();
 registerEditorFeature(ChatPasteProvidersFeature);
-registerEditorContribution(ChatEditorOverlayController.ID, ChatEditorOverlayController, EditorContributionInstantiation.Lazy);
-registerEditorContribution(ChatEditorController.ID, ChatEditorController, EditorContributionInstantiation.Eventually);
+registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);

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-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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;

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

@@ -1,5 +1,5 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { InlineAnchorWidget } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget";
+import { InlineAnchorWidget } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget";
 import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service";
 export declare class ChatMarkdownAnchorService extends Disposable implements IChatMarkdownAnchorService {
     readonly _serviceBrand: undefined;

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

@@ -1,9 +1,10 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model";
-import { ITextModelContentProvider, ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { ITextModelContentProvider } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 export declare class ChatInputBoxContentProvider extends Disposable implements ITextModelContentProvider {
     private readonly modelService;
     private readonly languageService;

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

@@ -1,10 +1,10 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
-import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
-import { ChatInputPart } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
+import { ChatInputPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
 
 let ChatInputBoxContentProvider = class ChatInputBoxContentProvider extends Disposable {
     constructor(textModelService, modelService, languageService) {

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

@@ -0,0 +1,10 @@
+import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
+export declare class ChatEditingEditorAccessibility implements IWorkbenchContribution {
+    static readonly ID = "chat.edits.accessibilty";
+    private readonly _store;
+    constructor(chatEditingService: IChatEditingService, editorService: IEditorService, accessibilityService: IAccessibilitySignalService);
+    dispose(): void;
+}

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

@@ -0,0 +1,38 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+
+let ChatEditingEditorAccessibility = class ChatEditingEditorAccessibility {
+    static { this.ID = 'chat.edits.accessibilty'; }
+    constructor(chatEditingService, editorService, accessibilityService) {
+        this._store = ( new DisposableStore());
+        const activeUri = observableFromEvent(this, editorService.onDidActiveEditorChange, () => editorService.activeEditorPane?.input.resource);
+        this._store.add(autorun(r => {
+            const editor = activeUri.read(r);
+            if (!editor) {
+                return;
+            }
+            const entry = chatEditingService.editingSessionsObs.read(r).find(session => session.readEntry(editor, r));
+            if (entry) {
+                accessibilityService.playSignal(AccessibilitySignal.chatEditModifiedFile);
+            }
+        }));
+    }
+    dispose() {
+        this._store.dispose();
+    }
+};
+ChatEditingEditorAccessibility = ( __decorate([
+    ( __param(0, IChatEditingService)),
+    ( __param(1, IEditorService)),
+    ( __param(2, IAccessibilitySignalService))
+], ChatEditingEditorAccessibility));
+
+export { ChatEditingEditorAccessibility };

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

@@ -0,0 +1,9 @@
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+export declare class ChatEditingEditorOverlay implements IWorkbenchContribution {
+    static readonly ID = "chat.edits.editorOverlay";
+    private readonly _store;
+    constructor(editorGroupsService: IEditorGroupsService, instantiationService: IInstantiationService);
+    dispose(): void;
+}