@codingame/monaco-vscode-chat-service-override 4.5.1 → 5.0.0

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

@@ -13,12 +13,12 @@ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { Extensions as Extensions$1, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
-import { alertFocusChange } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityContributions';
 import { IAccessibleViewService } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleView.service';
 import { AccessibleViewAction } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleViewActions';
+import { alertFocusChange } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleViewContributions';
 import { registerChatActions } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ACTION_ID_NEW_CHAT, registerNewChatActions } from './actions/chatClearActions.js';
-import { registerChatCodeBlockActions } from './actions/chatCodeblockActions.js';
+import { registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from './actions/chatCodeblockActions.js';
 import { registerChatCopyActions } from './actions/chatCopyActions.js';
 import { SubmitAction, registerChatExecuteActions } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { registerChatFileTreeActions } from './actions/chatFileTreeActions.js';
@@ -28,7 +28,6 @@ import { registerQuickChatActions } from 'vscode/vscode/vs/workbench/contrib/cha
 import { registerChatTitleActions } from './actions/chatTitleActions.js';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import './chatAccessibilityService.js';
-import './chatContributionServiceImpl.js';
 import { ChatEditor } from './chatEditor.js';
 import { ChatEditorInput, ChatEditorInputSerializer } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import './chatQuick.js';
@@ -48,63 +47,46 @@ import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/c
 import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import '../common/chatWidgetHistoryService.js';
 import 'vscode/vscode/vs/base/common/event';
+import '../common/languageModelStats.js';
 import '../common/voiceChat.js';
 import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
 import 'vscode/vscode/vs/workbench/contrib/chat/common/chatColors';
+import { ChatExtensionPointHandler } from './chatParticipantContributions.js';
 
-const configurationRegistry = ( Registry.as(Extensions.Configuration));
+const _moduleId = "vs/workbench/contrib/chat/browser/chat.contribution";
+const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
 configurationRegistry.registerConfiguration({
     id: 'chatSidebar',
-    title: ( localizeWithPath(
-        'vs/workbench/contrib/chat/browser/chat.contribution',
-        'interactiveSessionConfigurationTitle',
-        "Chat"
-    )),
+    title: ( localizeWithPath(_moduleId, 0, "Chat")),
     type: 'object',
     properties: {
         'chat.editor.fontSize': {
             type: 'number',
-            description: ( localizeWithPath(
-                'vs/workbench/contrib/chat/browser/chat.contribution',
-                'interactiveSession.editor.fontSize',
-                "Controls the font size in pixels in chat codeblocks."
-            )),
+            description: ( localizeWithPath(_moduleId, 1, "Controls the font size in pixels in chat codeblocks.")),
             default: isMacintosh ? 12 : 14,
         },
         'chat.editor.fontFamily': {
             type: 'string',
-            description: ( localizeWithPath(
-                'vs/workbench/contrib/chat/browser/chat.contribution',
-                'interactiveSession.editor.fontFamily',
-                "Controls the font family in chat codeblocks."
-            )),
+            description: ( localizeWithPath(_moduleId, 2, "Controls the font family in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.fontWeight': {
             type: 'string',
-            description: ( localizeWithPath(
-                'vs/workbench/contrib/chat/browser/chat.contribution',
-                'interactiveSession.editor.fontWeight',
-                "Controls the font weight in chat codeblocks."
-            )),
+            description: ( localizeWithPath(_moduleId, 3, "Controls the font weight in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.wordWrap': {
             type: 'string',
-            description: ( localizeWithPath(
-                'vs/workbench/contrib/chat/browser/chat.contribution',
-                'interactiveSession.editor.wordWrap',
-                "Controls whether lines should wrap in chat codeblocks."
-            )),
+            description: ( localizeWithPath(_moduleId, 4, "Controls whether lines should wrap in chat codeblocks.")),
             default: 'off',
             enum: ['on', 'off']
         },
         'chat.editor.lineHeight': {
             type: 'number',
             description: ( localizeWithPath(
-                'vs/workbench/contrib/chat/browser/chat.contribution',
-                'interactiveSession.editor.lineHeight',
+                _moduleId,
+                5,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
@@ -112,16 +94,16 @@ configurationRegistry.registerConfiguration({
         'chat.experimental.implicitContext': {
             type: 'boolean',
             description: ( localizeWithPath(
-                'vs/workbench/contrib/chat/browser/chat.contribution',
-                'chat.experimental.implicitContext',
+                _moduleId,
+                6,
                 "Controls whether a checkbox is shown to allow the user to determine which implicit context is included with a chat participant's prompt."
             )),
             default: false
         },
     }
 });
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localizeWithPath('vs/workbench/contrib/chat/browser/chat.contribution', 'chat', "Chat"))), [
-    ( new SyncDescriptor(ChatEditorInput))
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localizeWithPath(_moduleId, 7, "Chat"))), [
+    ( (new SyncDescriptor(ChatEditorInput)))
 ]);
 let ChatResolverContribution = class ChatResolverContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatResolver'; }
@@ -129,7 +111,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         super();
         this._register(editorResolverService.registerEditor(`${Schemas.vscodeChatSesssion}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localizeWithPath('vs/workbench/contrib/chat/browser/chat.contribution', 'chat', "Chat")),
+            label: ( localizeWithPath(_moduleId, 7, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
@@ -141,10 +123,10 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         }));
     }
 };
-ChatResolverContribution = ( __decorate([
-    ( __param(0, IEditorResolverService)),
-    ( __param(1, IInstantiationService))
-], ChatResolverContribution));
+ChatResolverContribution = ( (__decorate([
+    ( (__param(0, IEditorResolverService))),
+    ( (__param(1, IInstantiationService)))
+], ChatResolverContribution)));
 class ChatAccessibleViewContribution extends Disposable {
     constructor() {
         super();
@@ -177,7 +159,7 @@ class ChatAccessibleViewContribution extends Disposable {
                     const welcomeReplyContents = [];
                     for (const content of focusedItem.content) {
                         if (Array.isArray(content)) {
-                            welcomeReplyContents.push(...( content.map(m => m.message)));
+                            welcomeReplyContents.push(...( (content.map(m => m.message))));
                         }
                         else {
                             welcomeReplyContents.push(content.value);
@@ -229,11 +211,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
         super();
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'clear',
-            detail: ( localizeWithPath(
-                'vs/workbench/contrib/chat/browser/chat.contribution',
-                'clear',
-                "Start a new chat"
-            )),
+            detail: ( localizeWithPath(_moduleId, 8, "Start a new chat")),
             sortText: 'z2_clear',
             executeImmediately: true
         }, async () => {
@@ -252,64 +230,73 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                     progress.report({ content: defaultAgent.metadata.helpTextPrefix, kind: 'markdownContent' });
                 }
                 else {
-                    progress.report({ content: defaultAgent.metadata.helpTextPrefix, kind: 'content' });
+                    progress.report({ content: ( (new MarkdownString(defaultAgent.metadata.helpTextPrefix))), kind: 'markdownContent' });
                 }
-                progress.report({ content: '\n\n', kind: 'content' });
+                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 agentWithLeader = `${chatAgentLeader}${a.name}`;
                 const actionArg = { inputValue: `${agentWithLeader} ${a.metadata.sampleRequest}` };
                 const urlSafeArg = encodeURIComponent(JSON.stringify(actionArg));
-                const agentLine = `* [\`${agentWithLeader}\`](command:${SubmitAction.ID}?${urlSafeArg}) - ${a.description}`;
-                const commandText = ( a.slashCommands.map(c => {
+                const description = a.description ? `- ${a.description}` : '';
+                const agentLine = `* [\`${agentWithLeader}\`](command:${SubmitAction.ID}?${urlSafeArg}) ${description}`;
+                const commandText = ( (a.slashCommands.map(c => {
                     const actionArg = { inputValue: `${agentWithLeader} ${chatSubcommandLeader}${c.name} ${c.sampleRequest ?? ''}` };
                     const urlSafeArg = encodeURIComponent(JSON.stringify(actionArg));
-                    return `\t* [\`${chatSubcommandLeader}${c.name}\`](command:${SubmitAction.ID}?${urlSafeArg}) - ${c.description}`;
-                })).join('\n');
+                    const description = c.description ? `- ${c.description}` : '';
+                    return `\t* [\`${chatSubcommandLeader}${c.name}\`](command:${SubmitAction.ID}?${urlSafeArg}) ${description}`;
+                }))).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: [SubmitAction.ID] } }))), kind: 'markdownContent' });
             if (defaultAgent?.metadata.helpTextVariablesPrefix) {
-                progress.report({ content: '\n\n', kind: 'content' });
+                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: defaultAgent.metadata.helpTextVariablesPrefix, kind: 'content' });
+                    progress.report({ content: ( (new MarkdownString(defaultAgent.metadata.helpTextVariablesPrefix))), kind: 'markdownContent' });
                 }
-                const variableText = ( Array.from(chatVariablesService.getVariables())
-                    .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`))
+                const variables = [
+                    ...chatVariablesService.getVariables(),
+                    { name: 'file', description: ( localizeWithPath(_moduleId, 9, "Choose a file in the workspace")) }
+                ];
+                const variableText = ( (variables
+                    .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`)))
                     .join('\n');
-                progress.report({ content: '\n' + variableText, kind: 'content' });
+                progress.report({ content: ( (new MarkdownString('\n' + variableText))), kind: 'markdownContent' });
             }
             if (defaultAgent?.metadata.helpTextPostfix) {
-                progress.report({ content: '\n\n', kind: 'content' });
+                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: defaultAgent.metadata.helpTextPostfix, kind: 'content' });
+                    progress.report({ content: ( (new MarkdownString(defaultAgent.metadata.helpTextPostfix))), kind: 'markdownContent' });
                 }
             }
         }));
     }
 };
-ChatSlashStaticSlashCommandsContribution = ( __decorate([
-    ( __param(0, IChatSlashCommandService)),
-    ( __param(1, ICommandService)),
-    ( __param(2, IChatAgentService)),
-    ( __param(3, IChatVariablesService))
-], ChatSlashStaticSlashCommandsContribution));
-const workbenchContributionsRegistry = ( Registry.as(Extensions$1.Workbench));
+ChatSlashStaticSlashCommandsContribution = ( (__decorate([
+    ( (__param(0, IChatSlashCommandService))),
+    ( (__param(1, ICommandService))),
+    ( (__param(2, IChatAgentService))),
+    ( (__param(3, IChatVariablesService)))
+], ChatSlashStaticSlashCommandsContribution)));
+const workbenchContributionsRegistry = ( (Registry.as(Extensions$1.Workbench)));
 registerWorkbenchContribution2(ChatResolverContribution.ID, ChatResolverContribution, 1 );
 workbenchContributionsRegistry.registerWorkbenchContribution(ChatAccessibleViewContribution, 4 );
 workbenchContributionsRegistry.registerWorkbenchContribution(ChatSlashStaticSlashCommandsContribution, 4 );
-( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
+( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
+registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, 1 );
 registerChatActions();
 registerChatCopyActions();
 registerChatCodeBlockActions();
+registerChatCodeCompareBlockActions();
 registerChatFileTreeActions();
 registerChatTitleActions();
 registerChatExecuteActions();

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

@@ -1,11 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { status } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
-import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 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';
 
+const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 let ChatAccessibilityService = class ChatAccessibilityService extends Disposable {
     constructor(_accessibilitySignalService, _instantiationService) {
         super();
@@ -17,7 +18,7 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
     acceptRequest() {
         this._requestId++;
         this._accessibilitySignalService.playSignal(AccessibilitySignal.chatRequestSent, { allowManyInParallel: true });
-        this._pendingSignalMap.set(this._requestId, this._instantiationService.createInstance(AccessibilitySignalScheduler));
+        this._pendingSignalMap.set(this._requestId, this._instantiationService.createInstance(AccessibilityProgressSignalScheduler, CHAT_RESPONSE_PENDING_ALLOWANCE_MS, undefined));
         return this._requestId;
     }
     acceptResponse(response, requestId) {
@@ -36,26 +37,5 @@ ChatAccessibilityService = ( __decorate([
     ( __param(0, IAccessibilitySignalService)),
     ( __param(1, IInstantiationService))
 ], ChatAccessibilityService));
-const CHAT_RESPONSE_PENDING_AUDIO_CUE_LOOP_MS = 5000;
-const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
-let AccessibilitySignalScheduler = class AccessibilitySignalScheduler extends Disposable {
-    constructor(_accessibilitySignalService) {
-        super();
-        this._accessibilitySignalService = _accessibilitySignalService;
-        this._scheduler = ( new RunOnceScheduler(() => {
-            this._signalLoop = this._accessibilitySignalService.playSignalLoop(AccessibilitySignal.chatResponsePending, CHAT_RESPONSE_PENDING_AUDIO_CUE_LOOP_MS);
-        }, CHAT_RESPONSE_PENDING_ALLOWANCE_MS));
-        this._scheduler.schedule();
-    }
-    dispose() {
-        super.dispose();
-        this._signalLoop?.dispose();
-        this._scheduler.cancel();
-        this._scheduler.dispose();
-    }
-};
-AccessibilitySignalScheduler = ( __decorate([
-    ( __param(0, IAccessibilitySignalService))
-], AccessibilitySignalScheduler));
 
 export { ChatAccessibilityService };

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

@@ -22,6 +22,7 @@ import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser
 import { ChatWidget } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { clearChatEditor } from './actions/chatClear.js';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { CHAT_PROVIDER_ID } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 
 let ChatEditor = class ChatEditor extends EditorPane {
     get scopedContextKeyService() {
@@ -61,15 +62,15 @@ let ChatEditor = class ChatEditor extends EditorPane {
         super.setInput(input, options, context, token);
         const editorModel = await input.resolve();
         if (!editorModel) {
-            throw new Error(`Failed to get model for chat editor. id: ${input.sessionId}`);
+            throw ( new Error(`Failed to get model for chat editor. id: ${input.sessionId}`));
         }
         if (!this.widget) {
-            throw new Error('ChatEditor lifecycle issue: no editor widget');
+            throw ( new Error('ChatEditor lifecycle issue: no editor widget'));
         }
         this.updateModel(editorModel.model, options?.viewState ?? input.options.viewState);
     }
     updateModel(model, viewState) {
-        this._memento = ( new Memento('interactive-session-editor-' + model.providerId, this.storageService));
+        this._memento = ( new Memento('interactive-session-editor-' + CHAT_PROVIDER_ID, this.storageService));
         this._viewState = viewState ?? this._memento.getMemento(1 , 1 );
         this.widget.setModel(model, { ...this._viewState });
     }