@codingame/monaco-vscode-chat-service-override 11.1.2 → 12.0.0

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

@@ -1,109 +1,117 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { timeout } from 'vscode/vscode/vs/base/common/async';
 import { isMarkdownString, MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
-import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { isMacintosh, isNative } from 'vscode/vscode/vs/base/common/platform';
+import { registerEditorContribution, EditorContributionInstantiation } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { registerEditorFeature } from 'vscode/vscode/vs/editor/common/editorFeatures';
 import { localize } from 'vscode/vscode/vs/nls';
 import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/editor';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import 'vscode/vscode/vs/base/common/charCode';
 import 'vscode/vscode/vs/base/common/map';
 import 'vscode/vscode/vs/base/common/strings';
+import 'vscode/vscode/vs/base/common/marshallingIds';
 import 'vscode/vscode/vs/base/common/path';
 import 'vscode/vscode/vs/editor/common/languages';
-import '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { chatVariableLeader } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/chatColors';
+import { chatVariableLeader } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import '../common/chatServiceImpl.js';
 import '../common/chatSlashCommands.js';
 import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import '../common/chatWidgetHistoryService.js';
-import '../common/languageModels.js';
-import '../common/languageModelStats.js';
+import 'vscode/vscode/vs/workbench/contrib/chat/common/languageModels';
+import '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/languageModelStats';
 import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
 import '../common/voiceChatService.js';
 import { PanelChatAccessibilityHelp, QuickChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
-import { ChatCommandCenterRendering, registerChatActions } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ChatCommandCenterRendering, 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 './actions/chatClearActions.js';
 import { 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 { SubmitAction, registerChatExecuteActions } from '@codingame/monaco-vscode-chat-extensions-notebook-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 { registerChatExportActions } from './actions/chatImportExport.js';
 import { registerMoveActions } from './actions/chatMoveActions.js';
 import { registerQuickChatActions } from './actions/chatQuickInputActions.js';
-import { registerChatTitleActions } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
+import { registerChatTitleActions } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
 import './chatAccessibilityService.js';
-import 'vscode/vscode/vs/base/common/event';
-import 'vscode/vscode/vs/base/common/resources';
+import '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatAttachmentModel';
 import 'vscode/vscode/vs/base/browser/dom';
 import './chatEditing/chatEditingService.js';
 import { ChatEditor } from './chatEditor.js';
-import { registerChatEditorActions } from './chatEditorActions.js';
-import { ChatEditorController } from './chatEditorController.js';
-import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { ChatEditorSaving } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatEditorSaving';
-import { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
-import { ChatExtensionPointHandler, ChatCompatibilityNotifier } from './chatParticipantContributions.js';
+import { registerChatEditorActions } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatEditorActions';
+import { ChatEditorController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatEditorController';
+import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatInputBoxContentProvider } from './chatEdinputInputContentProvider.js';
+import { ChatEditorSaving, ChatEditorAutoSaveDisabler } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorSaving';
+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 './chatPasteProviders.js';
 import './chatQuick.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
 import './chatVariables.js';
-import '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import '@codingame/monaco-vscode-chat-notebook-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 '@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-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext';
+import { ChatImplicitContextContribution } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext';
 import './languageModelToolsService.js';
-import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeContributions.js';
+import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
 import { ChatGettingStartedContribution } from './actions/chatGettingStarted.js';
+import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/configuration';
+import { ChatEditorOverlayController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatEditorOverlay';
+import { ChatRelatedFilesContribution } from './contrib/chatInputRelatedFilesContrib.js';
+import { ChatQuotasStatusBarEntry } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatQuotasService';
 
-const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
+const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'chatSidebar',
-    title: ( localize(3196, "Chat")),
+    title: ( localize(4277, "Chat")),
     type: 'object',
     properties: {
         'chat.editor.fontSize': {
             type: 'number',
-            description: ( localize(3197, "Controls the font size in pixels in chat codeblocks.")),
+            description: ( localize(4278, "Controls the font size in pixels in chat codeblocks.")),
             default: isMacintosh ? 12 : 14,
         },
         'chat.editor.fontFamily': {
             type: 'string',
-            description: ( localize(3198, "Controls the font family in chat codeblocks.")),
+            description: ( localize(4279, "Controls the font family in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.fontWeight': {
             type: 'string',
-            description: ( localize(3199, "Controls the font weight in chat codeblocks.")),
+            description: ( localize(4280, "Controls the font weight in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.wordWrap': {
             type: 'string',
-            description: ( localize(3200, "Controls whether lines should wrap in chat codeblocks.")),
+            description: ( localize(4281, "Controls whether lines should wrap in chat codeblocks.")),
             default: 'off',
             enum: ['on', 'off']
         },
         'chat.editor.lineHeight': {
             type: 'number',
             description: ( localize(
-                3201,
+                4282,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
@@ -112,57 +120,73 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             tags: ['preview'],
             markdownDescription: ( localize(
-                3202,
-                "Controls whether the command center shows a menu for chat actions (requires {0}).",
+                4283,
+                "Controls whether the command center shows a menu for actions to control Copilot (requires {0}).",
                 '`#window.commandCenter#`'
             )),
             default: true
         },
+        'chat.experimental.offerSetup': {
+            type: 'boolean',
+            default: isNative,
+            scope: ConfigurationScope.APPLICATION,
+            markdownDescription: ( localize(4284, "Controls whether setup is offered for Chat if not done already.")),
+            tags: ['experimental', 'onExP']
+        },
         'chat.editing.alwaysSaveWithGeneratedChanges': {
             type: 'boolean',
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                3203,
-                "Whether to always ask before saving files with changes made by chat."
+                4285,
+                "Whether files that have changes made by chat can be saved without confirmation."
             )),
             default: false,
         },
         'chat.editing.confirmEditRequestRemoval': {
             type: 'boolean',
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                3204,
+                4286,
                 "Whether to show a confirmation before removing a request and its associated edits."
             )),
             default: true,
         },
         'chat.editing.confirmEditRequestRetry': {
             type: 'boolean',
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                3205,
+                4287,
                 "Whether to show a confirmation before retrying a request and its associated edits."
             )),
             default: true,
         },
-        'chat.editing.experimental.enableRestoreFile': {
+        'chat.experimental.detectParticipant.enabled': {
             type: 'boolean',
-            scope: 1 ,
-            markdownDescription: ( localize(
-                3206,
-                "Whether to show a toggle to restore an earlier version of a file that was edited in a chat editing session request."
+            deprecationMessage: ( localize(
+                4288,
+                "This setting is deprecated. Please use `chat.detectParticipant.enabled` instead."
             )),
-            default: false,
+            description: ( localize(4289, "Enables chat participant autodetection for panel chat.")),
+            default: null
         },
-        'chat.experimental.detectParticipant.enabled': {
+        'chat.detectParticipant.enabled': {
             type: 'boolean',
-            description: ( localize(3207, "Enables chat participant autodetection for panel chat.")),
-            default: null
+            description: ( localize(4290, "Enables chat participant autodetection for panel chat.")),
+            default: true
         },
     }
 });
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(3208, "Chat"))), [
-    ( (new SyncDescriptor(ChatEditorInput)))
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(4291, "Chat"))), [
+    ( new SyncDescriptor(ChatEditorInput))
+]);
+( Registry.as(Extensions$1.ConfigurationMigration)).registerConfigurationMigrations([
+    {
+        key: 'chat.experimental.detectParticipant.enabled',
+        migrateFn: (value, _accessor) => ([
+            ['chat.experimental.detectParticipant.enabled', { value: undefined }],
+            ['chat.detectParticipant.enabled', { value: value !== false }]
+        ])
+    }
 ]);
 let ChatResolverContribution = class ChatResolverContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatResolver'; }
@@ -170,7 +194,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         super();
         this._register(editorResolverService.registerEditor(`${Schemas.vscodeChatSesssion}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localize(3208, "Chat")),
+            label: ( localize(4291, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
@@ -182,20 +206,21 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         }));
     }
 };
-ChatResolverContribution = ( (__decorate([
-    ( (__param(0, IEditorResolverService))),
-    ( (__param(1, IInstantiationService)))
-], ChatResolverContribution)));
-AccessibleViewRegistry.register(( (new ChatResponseAccessibleView())));
-AccessibleViewRegistry.register(( (new PanelChatAccessibilityHelp())));
-AccessibleViewRegistry.register(( (new QuickChatAccessibilityHelp())));
+ChatResolverContribution = ( __decorate([
+    ( __param(0, IEditorResolverService)),
+    ( __param(1, IInstantiationService))
+], ChatResolverContribution));
+AccessibleViewRegistry.register(( new ChatResponseAccessibleView()));
+AccessibleViewRegistry.register(( new PanelChatAccessibilityHelp()));
+AccessibleViewRegistry.register(( new QuickChatAccessibilityHelp()));
+registerEditorFeature(ChatInputBoxContentProvider);
 let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommandsContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatSlashStaticSlashCommands'; }
     constructor(slashCommandService, commandService, chatAgentService, chatVariablesService, instantiationService) {
         super();
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'clear',
-            detail: ( localize(3209, "Start a new chat")),
+            detail: ( localize(4292, "Start a new chat")),
             sortText: 'z2_clear',
             executeImmediately: true,
             locations: [ChatAgentLocation.Panel]
@@ -216,72 +241,75 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                     progress.report({ content: defaultAgent.metadata.helpTextPrefix, kind: 'markdownContent' });
                 }
                 else {
-                    progress.report({ content: ( (new MarkdownString(defaultAgent.metadata.helpTextPrefix))), kind: 'markdownContent' });
+                    progress.report({ content: ( new MarkdownString(defaultAgent.metadata.helpTextPrefix)), kind: 'markdownContent' });
                 }
-                progress.report({ content: ( (new MarkdownString('\n\n'))), kind: 'markdownContent' });
+                progress.report({ content: ( new MarkdownString('\n\n')), kind: 'markdownContent' });
             }
-            const agentText = (await Promise.all(( (agents
+            const agentText = (await Promise.all(( agents
                 .filter(a => a.id !== defaultAgent?.id)
                 .filter(a => a.locations.includes(ChatAgentLocation.Panel))
                 .map(async (a) => {
                 const description = a.description ? `- ${a.description}` : '';
                 const agentMarkdown = instantiationService.invokeFunction(accessor => agentToMarkdown(a, true, accessor));
                 const agentLine = `- ${agentMarkdown} ${description}`;
-                const commandText = ( (a.slashCommands.map(c => {
+                const commandText = ( a.slashCommands.map(c => {
                     const description = c.description ? `- ${c.description}` : '';
                     return `\t* ${agentSlashCommandToMarkdown(a, c)} ${description}`;
-                }))).join('\n');
+                })).join('\n');
                 return (agentLine + '\n' + commandText).trim();
-            }))))).join('\n');
-            progress.report({ content: ( (new MarkdownString(agentText, { isTrusted: { enabledCommands: [SubmitAction.ID] } }))), kind: 'markdownContent' });
+            })))).join('\n');
+            progress.report({ content: ( new MarkdownString(agentText, { isTrusted: { enabledCommands: [ChatSubmitAction.ID] } })), kind: 'markdownContent' });
             if (defaultAgent?.metadata.helpTextVariablesPrefix) {
-                progress.report({ content: ( (new MarkdownString('\n\n'))), kind: 'markdownContent' });
+                progress.report({ content: ( new MarkdownString('\n\n')), kind: 'markdownContent' });
                 if (isMarkdownString(defaultAgent.metadata.helpTextVariablesPrefix)) {
                     progress.report({ content: defaultAgent.metadata.helpTextVariablesPrefix, kind: 'markdownContent' });
                 }
                 else {
-                    progress.report({ content: ( (new MarkdownString(defaultAgent.metadata.helpTextVariablesPrefix))), kind: 'markdownContent' });
+                    progress.report({ content: ( new MarkdownString(defaultAgent.metadata.helpTextVariablesPrefix)), kind: 'markdownContent' });
                 }
                 const variables = [
                     ...chatVariablesService.getVariables(ChatAgentLocation.Panel),
-                    { name: 'file', description: ( localize(3210, "Choose a file in the workspace")) }
+                    { name: 'file', description: ( localize(4293, "Choose a file in the workspace")) }
                 ];
-                const variableText = ( (variables
-                    .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`)))
+                const variableText = ( variables
+                    .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`))
                     .join('\n');
-                progress.report({ content: ( (new MarkdownString('\n' + variableText))), kind: 'markdownContent' });
+                progress.report({ content: ( new MarkdownString('\n' + variableText)), kind: 'markdownContent' });
             }
             if (defaultAgent?.metadata.helpTextPostfix) {
-                progress.report({ content: ( (new MarkdownString('\n\n'))), kind: 'markdownContent' });
+                progress.report({ content: ( new MarkdownString('\n\n')), kind: 'markdownContent' });
                 if (isMarkdownString(defaultAgent.metadata.helpTextPostfix)) {
                     progress.report({ content: defaultAgent.metadata.helpTextPostfix, kind: 'markdownContent' });
                 }
                 else {
-                    progress.report({ content: ( (new MarkdownString(defaultAgent.metadata.helpTextPostfix))), kind: 'markdownContent' });
+                    progress.report({ content: ( new MarkdownString(defaultAgent.metadata.helpTextPostfix)), kind: 'markdownContent' });
                 }
             }
             await timeout(200);
         }));
     }
 };
-ChatSlashStaticSlashCommandsContribution = ( (__decorate([
-    ( (__param(0, IChatSlashCommandService))),
-    ( (__param(1, ICommandService))),
-    ( (__param(2, IChatAgentService))),
-    ( (__param(3, IChatVariablesService))),
-    ( (__param(4, IInstantiationService)))
-], ChatSlashStaticSlashCommandsContribution)));
-( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
-registerWorkbenchContribution2(ChatResolverContribution.ID, ChatResolverContribution, 1 );
-registerWorkbenchContribution2(ChatSlashStaticSlashCommandsContribution.ID, ChatSlashStaticSlashCommandsContribution, 4 );
-registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, 1 );
-registerWorkbenchContribution2(LanguageModelToolsExtensionPointHandler.ID, LanguageModelToolsExtensionPointHandler, 2 );
-registerWorkbenchContribution2(ChatCompatibilityNotifier.ID, ChatCompatibilityNotifier, 4 );
-registerWorkbenchContribution2(ChatCommandCenterRendering.ID, ChatCommandCenterRendering, 3 );
-registerWorkbenchContribution2(ChatImplicitContextContribution.ID, ChatImplicitContextContribution, 4 );
-registerWorkbenchContribution2(ChatEditorSaving.ID, ChatEditorSaving, 3 );
-registerWorkbenchContribution2(ChatViewsWelcomeHandler.ID, ChatViewsWelcomeHandler, 1 );
-registerWorkbenchContribution2(ChatGettingStartedContribution.ID, ChatGettingStartedContribution, 4 );
+ChatSlashStaticSlashCommandsContribution = ( __decorate([
+    ( __param(0, IChatSlashCommandService)),
+    ( __param(1, ICommandService)),
+    ( __param(2, IChatAgentService)),
+    ( __param(3, IChatVariablesService)),
+    ( __param(4, IInstantiationService))
+], ChatSlashStaticSlashCommandsContribution));
+( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
+registerWorkbenchContribution2(ChatResolverContribution.ID, ChatResolverContribution, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(ChatSlashStaticSlashCommandsContribution.ID, ChatSlashStaticSlashCommandsContribution, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(LanguageModelToolsExtensionPointHandler.ID, LanguageModelToolsExtensionPointHandler, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ChatCompatibilityNotifier.ID, ChatCompatibilityNotifier, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(ChatCommandCenterRendering.ID, ChatCommandCenterRendering, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ChatImplicitContextContribution.ID, ChatImplicitContextContribution, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(ChatRelatedFilesContribution.ID, ChatRelatedFilesContribution, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(ChatEditorSaving.ID, ChatEditorSaving, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(ChatEditorAutoSaveDisabler.ID, ChatEditorAutoSaveDisabler, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ChatViewsWelcomeHandler.ID, ChatViewsWelcomeHandler, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(ChatGettingStartedContribution.ID, ChatGettingStartedContribution, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(ChatQuotasStatusBarEntry.ID, ChatQuotasStatusBarEntry, WorkbenchPhase.Eventually);
 registerChatActions();
 registerChatCopyActions();
 registerChatCodeBlockActions();
@@ -297,4 +325,5 @@ registerChatContextActions();
 registerChatDeveloperActions();
 registerChatEditorActions();
 registerEditorFeature(ChatPasteProvidersFeature);
-registerEditorContribution(ChatEditorController.ID, ChatEditorController, 3 );
+registerEditorContribution(ChatEditorController.ID, ChatEditorController, EditorContributionInstantiation.Eventually);
+registerEditorContribution(ChatEditorOverlayController.ID, ChatEditorOverlayController, EditorContributionInstantiation.Eventually);

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

@@ -0,0 +1,17 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IAccessibilitySignalService } from "vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IChatAccessibilityService } from "vscode/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+export declare class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
+    private readonly _accessibilitySignalService;
+    private readonly _instantiationService;
+    private readonly _configurationService;
+    readonly _serviceBrand: undefined;
+    private _pendingSignalMap;
+    private _requestId;
+    constructor(_accessibilitySignalService: IAccessibilitySignalService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService);
+    acceptRequest(): number;
+    acceptResponse(response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
+}

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

@@ -1,13 +1,16 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { status } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { AccessibilityProgressSignalScheduler } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
+import { AccessibilityProgressSignalScheduler } from '@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common/vscode/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
 import { renderStringAsPlaintext } from 'vscode/vscode/vs/base/browser/markdownRenderer';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { AccessibilityVoiceSettingId } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService';
 
 const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 let ChatAccessibilityService = class ChatAccessibilityService extends Disposable {
@@ -35,7 +38,7 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         }
         const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : '';
         const plainTextResponse = renderStringAsPlaintext(( new MarkdownString(responseContent)));
-        if (!isVoiceInput || this._configurationService.getValue("accessibility.voice.autoSynthesize" ) !== 'on') {
+        if (!isVoiceInput || this._configurationService.getValue(AccessibilityVoiceSettingId.AutoSynthesize) !== 'on') {
             status(plainTextResponse + errorDetails);
         }
     }

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

@@ -0,0 +1,12 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { ILanguageService } from "vscode/vscode/vs/editor/common/languages/language";
+import { ITextModel } from "vscode/vscode/vs/editor/common/model";
+import { IModelService } from "vscode/vscode/vs/editor/common/services/model";
+import { ITextModelContentProvider, ITextModelService } from "vscode/vscode/vs/editor/common/services/resolverService";
+export declare class ChatInputBoxContentProvider extends Disposable implements ITextModelContentProvider {
+    private readonly modelService;
+    private readonly languageService;
+    constructor(textModelService: ITextModelService, modelService: IModelService, languageService: ILanguageService);
+    provideTextContent(resource: URI): Promise<ITextModel | null>;
+}

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

@@ -0,0 +1,30 @@
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { ITextModelService } from 'vscode/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';
+
+let ChatInputBoxContentProvider = class ChatInputBoxContentProvider extends Disposable {
+    constructor(textModelService, modelService, languageService) {
+        super();
+        this.modelService = modelService;
+        this.languageService = languageService;
+        this._register(textModelService.registerTextModelContentProvider(ChatInputPart.INPUT_SCHEME, this));
+    }
+    async provideTextContent(resource) {
+        const existing = this.modelService.getModel(resource);
+        if (existing) {
+            return existing;
+        }
+        return this.modelService.createModel('', this.languageService.createById('chatinput'), resource);
+    }
+};
+ChatInputBoxContentProvider = ( __decorate([
+    ( __param(0, ITextModelService)),
+    ( __param(1, IModelService)),
+    ( __param(2, ILanguageService))
+], ChatInputBoxContentProvider));
+
+export { ChatInputBoxContentProvider };

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

@@ -0,0 +1,69 @@
+import { CancellationToken, CancellationTokenSource } from "vscode/vscode/vs/base/common/cancellation";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IObservable } from "vscode/vscode/vs/base/common/observable";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { ITextModelService } from "vscode/vscode/vs/editor/common/services/resolverService";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IProgressService } from "vscode/vscode/vs/platform/progress/common/progress.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IWorkbenchAssignmentService } from "vscode/vscode/vs/workbench/services/assignment/common/assignmentService.service";
+import { IDecorationsService } from "vscode/vscode/vs/workbench/services/decorations/common/decorations.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+import { ILifecycleService } from "vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
+import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-9d05a43d-c330-5ff1-937e-fde4a3852931-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { IMultiDiffSourceResolverService } from "vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service";
+import { IChatEditingSession, IChatRelatedFile, IChatRelatedFilesProvider } from "vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatEditingService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
+import { IChatService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { ChatEditingSession } from "./chatEditingSession.js";
+export declare class ChatEditingService extends Disposable implements IChatEditingService {
+    private readonly _instantiationService;
+    private readonly _chatService;
+    private readonly _progressService;
+    private readonly _editorService;
+    private readonly _fileService;
+    private readonly lifecycleService;
+    private readonly _workbenchAssignmentService;
+    _serviceBrand: undefined;
+    private readonly _currentSessionObs;
+    private readonly _currentSessionDisposables;
+    private readonly _currentAutoApplyOperationObs;
+    get currentAutoApplyOperation(): CancellationTokenSource | null;
+    get currentEditingSession(): IChatEditingSession | null;
+    get currentEditingSessionObs(): IObservable<IChatEditingSession | null>;
+    private readonly _onDidCreateEditingSession;
+    get onDidCreateEditingSession(): Event<IChatEditingSession>;
+    private readonly _onDidChangeEditingSession;
+    readonly onDidChangeEditingSession: Event<void>;
+    private _editingSessionFileLimitPromise;
+    private _editingSessionFileLimit;
+    get editingSessionFileLimit(): number;
+    private _restoringEditingSession;
+    private _applyingChatEditsFailedContextKey;
+    private _chatRelatedFilesProviders;
+    constructor(_instantiationService: IInstantiationService, multiDiffSourceResolverService: IMultiDiffSourceResolverService, textModelService: ITextModelService, contextKeyService: IContextKeyService, _chatService: IChatService, _progressService: IProgressService, _editorService: IEditorService, decorationsService: IDecorationsService, _fileService: IFileService, lifecycleService: ILifecycleService, _workbenchAssignmentService: IWorkbenchAssignmentService, storageService: IStorageService);
+    getOrRestoreEditingSession(): Promise<IChatEditingSession | null>;
+    dispose(): void;
+    startOrContinueEditingSession(chatSessionId: string): Promise<IChatEditingSession>;
+    private _createEditingSession;
+    private installAutoApplyObserver;
+    private _continueEditingSession;
+    hasRelatedFilesProviders(): boolean;
+    registerRelatedFilesProvider(handle: number, provider: IChatRelatedFilesProvider): IDisposable;
+    getRelatedFiles(chatSessionId: string, prompt: string, token: CancellationToken): Promise<{
+        group: string;
+        files: IChatRelatedFile[];
+    }[] | undefined>;
+}
+export declare class ChatEditingMultiDiffSourceResolver implements IMultiDiffSourceResolver {
+    private readonly _currentSession;
+    private readonly _instantiationService;
+    static readonly scheme = "chat-editing-multi-diff-source";
+    static getMultiDiffSourceUri(): URI;
+    constructor(_currentSession: IObservable<ChatEditingSession | null>, _instantiationService: IInstantiationService);
+    canHandleUri(uri: URI): boolean;
+    resolveDiffSource(uri: URI): Promise<IResolvedMultiDiffSource>;
+}