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

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.js

@@ -1,13 +1,14 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import marked_1 from 'vscode/external/vscode-marked/lib/marked.esm.js';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
-import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { CONTEXT_RESPONSE_VOTE, CONTEXT_RESPONSE, CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE_FILTERED, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT, CONTEXT_REQUEST } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { CONTEXT_RESPONSE_VOTE, CONTEXT_RESPONSE, CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE_FILTERED, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT, CONTEXT_REQUEST, CONTEXT_CHAT_LOCATION, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { InteractiveSessionVoteDirection } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { isResponseVM, isRequestVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
@@ -41,7 +42,6 @@ function registerChatTitleActions() {
             }
             const chatService = accessor.get(IChatService);
             chatService.notifyUserAction({
-                providerId: item.providerId,
                 agentId: item.agent?.id,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
@@ -78,7 +78,6 @@ function registerChatTitleActions() {
             }
             const chatService = accessor.get(IChatService);
             chatService.notifyUserAction({
-                providerId: item.providerId,
                 agentId: item.agent?.id,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
@@ -114,7 +113,6 @@ function registerChatTitleActions() {
             }
             const chatService = accessor.get(IChatService);
             chatService.notifyUserAction({
-                providerId: item.providerId,
                 agentId: item.agent?.id,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
@@ -226,6 +224,85 @@ function registerChatTitleActions() {
             }
         }
     });
+    const rerunMenu = MenuId.for('ChatMessageTitle#Rerun');
+    MenuRegistry.appendMenuItem(MenuId.ChatMessageTitle, {
+        submenu: rerunMenu,
+        title: ( localizeWithPath(_moduleId, 5, "Rerun...")),
+        icon: Codicon.refresh,
+        group: 'navigation',
+        order: -10,
+        when: ( (ContextKeyExpr.and(
+            CONTEXT_RESPONSE,
+             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))
+        )))
+    });
+    registerAction2(class RerunAction extends Action2 {
+        constructor() {
+            super({
+                id: 'workbench.action.chat.rerun',
+                title: ( localize2WithPath(_moduleId, 6, "Rerun Request")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                icon: Codicon.refresh,
+                precondition: ( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))),
+                menu: {
+                    id: rerunMenu,
+                    group: 'navigation',
+                    order: -1,
+                }
+            });
+        }
+        async run(accessor, ...args) {
+            const chatWidgetService = accessor.get(IChatWidgetService);
+            const chatService = accessor.get(IChatService);
+            const widget = chatWidgetService.lastFocusedWidget;
+            let item = args[0];
+            if (!isResponseVM(item)) {
+                item = widget?.getFocus();
+            }
+            if (!isResponseVM(item) || !widget) {
+                return;
+            }
+            const request = chatService.getSession(item.sessionId)?.getRequests().find(candidate => candidate.id === item.requestId);
+            if (request) {
+                await chatService.resendRequest(request, { noCommandDetection: false, attempt: request.attempt + 1, location: widget.location, implicitVariablesEnabled: true });
+            }
+        }
+    });
+    registerAction2(class RerunWithoutCommandDetectionAction extends Action2 {
+        constructor() {
+            super({
+                id: 'workbench.action.chat.rerunWithoutCommandDetection',
+                title: ( localize2WithPath(_moduleId, 7, "Rerun without Command Detection")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                icon: Codicon.refresh,
+                precondition: ( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))),
+                menu: {
+                    when: CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND,
+                    id: rerunMenu,
+                    group: 'navigation',
+                    order: -1,
+                }
+            });
+        }
+        async run(accessor, ...args) {
+            const chatWidgetService = accessor.get(IChatWidgetService);
+            const chatService = accessor.get(IChatService);
+            const widget = chatWidgetService.lastFocusedWidget;
+            let item = args[0];
+            if (!isResponseVM(item)) {
+                item = widget?.getFocus();
+            }
+            if (!isResponseVM(item) || !widget) {
+                return;
+            }
+            const request = chatService.getSession(item.sessionId)?.getRequests().find(candidate => candidate.id === item.requestId);
+            if (request) {
+                await chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt, location: widget.location, implicitVariablesEnabled: true });
+            }
+        }
+    });
 }
 function splitMarkdownAndCodeBlocks(markdown) {
     const lexer = new marked_1.Lexer();

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,10 +47,12 @@ 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 _moduleId = "vs/workbench/contrib/chat/browser/chat.contribution";
 const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
@@ -229,45 +230,52 @@ 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
                 .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 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}`;
+                    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' });
             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())
+                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' });
                 }
             }
         }));
@@ -284,9 +292,11 @@ registerWorkbenchContribution2(ChatResolverContribution.ID, ChatResolverContribu
 workbenchContributionsRegistry.registerWorkbenchContribution(ChatAccessibleViewContribution, 4 );
 workbenchContributionsRegistry.registerWorkbenchContribution(ChatSlashStaticSlashCommandsContribution, 4 );
 ( (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() {
@@ -69,7 +70,7 @@ let ChatEditor = class ChatEditor extends EditorPane {
         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 });
     }