@codingame/monaco-vscode-api 5.3.0 → 6.0.0

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

@@ -1,7 +1,9 @@
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../../base/common/keyCodes.js';
 import { localize2WithPath } from '../../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 import { IChatWidgetService } from '../chat.service.js';
 import { IChatAgentService } from '../../common/chatAgents.service.js';
@@ -24,8 +26,8 @@ class SubmitAction extends Action2 {
             ))),
             keybinding: {
                 when: CONTEXT_IN_CHAT_INPUT,
-                primary: 3 ,
-                weight: 100
+                primary: KeyCode.Enter,
+                weight: KeybindingWeight.EditorContrib
             },
             menu: [
                 {
@@ -60,8 +62,8 @@ class ChatSubmitSecondaryAgentAction extends Action2 {
             ))),
             keybinding: {
                 when: CONTEXT_IN_CHAT_INPUT,
-                primary: 2048  | 3 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.Enter,
+                weight: KeybindingWeight.EditorContrib
             },
             menu: {
                 id: MenuId.ChatExecuteSecondary,
@@ -106,8 +108,8 @@ class SendToNewChatAction extends Action2 {
                 group: 'group_2'
             },
             keybinding: {
-                weight: 200 ,
-                primary: 2048  | 1024  | 3 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Enter,
                 when: CONTEXT_IN_CHAT_INPUT,
             }
         });
@@ -138,8 +140,8 @@ class CancelAction extends Action2 {
                 group: 'navigation',
             },
             keybinding: {
-                weight: 200 ,
-                primary: 2048  | 9 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod$1.CtrlCmd | KeyCode.Escape,
             }
         });
     }

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

@@ -1,8 +1,10 @@
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../../base/common/keyCodes.js';
 import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
 import { Selection } from '../../../../../editor/common/core/selection.js';
 import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
 import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 import { IQuickChatService } from '../chat.service.js';
 import { CONTEXT_CHAT_ENABLED } from '../../common/chatContextKeys.js';
@@ -90,10 +92,10 @@ class QuickChatGlobalAction extends Action2 {
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
-                weight: 200 ,
-                primary: 2048  | 1024  | 39 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyI,
                 linux: {
-                    primary: 2048  | 1024  | 512  | 39
+                    primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.KeyI
                 }
             },
             metadata: {

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

@@ -1,7 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import marked_1 from '../../../../../../../external/vscode-marked/lib/marked.esm.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { IAccessibleViewService } from '../../accessibility/browser/accessibleView.service.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.service.js';
 import { isRequestVM, isResponseVM, isWelcomeVM } from '../common/chatViewModel.js';
 const _moduleId = "vs/workbench/contrib/chat/browser/chatAccessibilityProvider";
 let ChatAccessibilityProvider = class ChatAccessibilityProvider {
@@ -32,7 +33,7 @@ let ChatAccessibilityProvider = class ChatAccessibilityProvider {
         return '';
     }
     _getLabelWithCodeBlockCount(element) {
-        const accessibleViewHint = this._accessibleViewService.getOpenAriaHint("accessibility.verbosity.panelChat" );
+        const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.Chat);
         let label = '';
         const fileTreeCount = element.response.value.filter((v) => !('value' in v))?.length ?? 0;
         let fileTreeCountHint = '';

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

@@ -1,25 +1,25 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { h, $, append } from '../../../../base/browser/dom.js';
-import { Button } from '../../../../base/browser/ui/button/button.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { FileAccess } from '../../../../base/common/network.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
-import { IChatAgentService } from '../common/chatAgents.service.js';
+import { getFullyQualifiedId } from '../common/chatAgents.js';
+import { IChatAgentService, IChatAgentNameService } from '../common/chatAgents.service.js';
 import { showExtensionsWithIdsCommandId } from '../../extensions/browser/extensionsActions.js';
 import { verifiedPublisherIcon } from '../../extensions/browser/extensionsIcons.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.service.js';
 const _moduleId = "vs/workbench/contrib/chat/browser/chatAgentHover";
 let ChatAgentHover = class ChatAgentHover extends Disposable {
-    constructor(chatAgentService, extensionService, commandService) {
+    constructor(chatAgentService, extensionService, chatAgentNameService) {
         super();
         this.chatAgentService = chatAgentService;
         this.extensionService = extensionService;
-        this.commandService = commandService;
+        this.chatAgentNameService = chatAgentNameService;
         const hoverElement = h('.chat-agent-hover@root', [
             h('.chat-agent-hover-header', [
                 h('.chat-agent-hover-icon@icon'),
@@ -32,8 +32,8 @@ let ChatAgentHover = class ChatAgentHover extends Disposable {
                     ]),
                 ]),
             ]),
+            h('.chat-agent-hover-warning@warning'),
             h('span.chat-agent-hover-description@description'),
-            h('span.chat-agent-hover-marketplace-button@button'),
         ]);
         this.domNode = hoverElement.root;
         this.icon = hoverElement.icon;
@@ -41,32 +41,14 @@ let ChatAgentHover = class ChatAgentHover extends Disposable {
         this.extensionName = hoverElement.extensionName;
         this.description = hoverElement.description;
         hoverElement.separator.textContent = '|';
-        this.verifiedBadge = $('span.extension-verified-publisher', undefined, renderIcon(verifiedPublisherIcon));
-        this.verifiedBadge.style.display = 'none';
+        const verifiedBadge = $('span.extension-verified-publisher', undefined, renderIcon(verifiedPublisherIcon));
         this.publisherName = $('span.chat-agent-hover-publisher-name');
-        append(hoverElement.publisher, this.verifiedBadge, this.publisherName);
-        const label = ( localizeWithPath(_moduleId, 0, "View in Marketplace")) + '.';
-        const marketplaceButton = this._register(( (new Button(hoverElement.button, {
-            title: label,
-            buttonBackground: undefined,
-            buttonBorder: undefined,
-            buttonForeground: undefined,
-            buttonHoverBackground: undefined,
-            buttonSecondaryBackground: undefined,
-            buttonSecondaryForeground: undefined,
-            buttonSecondaryHoverBackground: undefined,
-            buttonSeparator: undefined,
-        }))));
-        marketplaceButton.label = label;
-        this._register(marketplaceButton.onDidClick(() => {
-            if (this.currentAgent) {
-                this.commandService.executeCommand(showExtensionsWithIdsCommandId, [this.currentAgent.extensionId.value]);
-            }
-        }));
+        append(hoverElement.publisher, verifiedBadge, this.publisherName);
+        hoverElement.warning.appendChild(renderIcon(Codicon.warning));
+        hoverElement.warning.appendChild($('span', undefined, ( localizeWithPath(_moduleId, 0, "This chat extension is using a reserved name."))));
     }
     setAgent(id) {
         const agent = this.chatAgentService.getAgent(id);
-        this.currentAgent = agent;
         if (agent.metadata.icon instanceof URI) {
             const avatarIcon = $('img.icon');
             avatarIcon.src = ( (FileAccess.uriToBrowserUri(agent.metadata.icon).toString(true)));
@@ -76,26 +58,51 @@ let ChatAgentHover = class ChatAgentHover extends Disposable {
             const avatarIcon = $(ThemeIcon.asCSSSelector(agent.metadata.themeIcon));
             this.icon.replaceChildren($('.avatar.codicon-avatar', undefined, avatarIcon));
         }
-        this.name.textContent = `@${agent.name}`;
+        this.domNode.classList.toggle('noExtensionName', !!agent.isDynamic);
+        const isAllowed = this.chatAgentNameService.getAgentNameRestriction(agent);
+        this.name.textContent = isAllowed ? `@${agent.name}` : getFullyQualifiedId(agent);
         this.extensionName.textContent = agent.extensionDisplayName;
-        this.publisherName.textContent = agent.extensionPublisherDisplayName ?? agent.extensionPublisherId;
-        const description = agent.description && !agent.description.endsWith('.') ?
-            `${agent.description}. ` :
-            (agent.description || '');
-        this.description.textContent = description;
-        const cancel = this._register(( (new CancellationTokenSource())));
-        this.extensionService.getExtensions([{ id: agent.extensionId.value }], cancel.token).then(extensions => {
-            cancel.dispose();
-            const extension = extensions[0];
-            if (extension?.publisherDomain?.verified) {
-                this.verifiedBadge.style.display = '';
+        this.publisherName.textContent = agent.publisherDisplayName ?? agent.extensionPublisherId;
+        let description = agent.description ?? '';
+        if (description) {
+            if (!description.match(/[\.\?\!] *$/)) {
+                description += '.';
             }
-        });
+        }
+        this.description.textContent = description;
+        this.domNode.classList.toggle('allowedName', isAllowed);
+        this.domNode.classList.toggle('verifiedPublisher', false);
+        if (!agent.isDynamic) {
+            const cancel = this._register(( (new CancellationTokenSource())));
+            this.extensionService.getExtensions([{ id: agent.extensionId.value }], cancel.token).then(extensions => {
+                cancel.dispose();
+                const extension = extensions[0];
+                if (extension?.publisherDomain?.verified) {
+                    this.domNode.classList.toggle('verifiedPublisher', true);
+                }
+            });
+        }
     }
 };
 ChatAgentHover = ( (__decorate([
     ( (__param(0, IChatAgentService))),
     ( (__param(1, IExtensionsWorkbenchService))),
-    ( (__param(2, ICommandService)))
+    ( (__param(2, IChatAgentNameService)))
 ], ChatAgentHover)));
-export { ChatAgentHover };
+function getChatAgentHoverOptions(getAgent, commandService) {
+    return {
+        actions: [
+            {
+                commandId: showExtensionsWithIdsCommandId,
+                label: ( localizeWithPath(_moduleId, 1, "View Extension")),
+                run: () => {
+                    const agent = getAgent();
+                    if (agent) {
+                        commandService.executeCommand(showExtensionsWithIdsCommandId, [agent.extensionId.value]);
+                    }
+                },
+            }
+        ]
+    };
+}
+export { ChatAgentHover, getChatAgentHoverOptions };

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

@@ -0,0 +1,47 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { h } from '../../../../base/browser/dom.js';
+import './media/chatConfirmationWidget.css.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+let ChatConfirmationWidget = class ChatConfirmationWidget extends Disposable {
+    get onDidClick() { return this._onDidClick.event; }
+    get domNode() {
+        return this._domNode;
+    }
+    setShowButtons(showButton) {
+        this.domNode.classList.toggle('hideButtons', !showButton);
+    }
+    constructor(title, message, buttons, instantiationService) {
+        super();
+        this.instantiationService = instantiationService;
+        this._onDidClick = this._register(( new Emitter()));
+        const elements = h('.chat-confirmation-widget@root', [
+            h('.chat-confirmation-widget-title@title'),
+            h('.chat-confirmation-widget-message@message'),
+            h('.chat-confirmation-buttons-container@buttonsContainer'),
+        ]);
+        this._domNode = elements.root;
+        const renderer = this._register(this.instantiationService.createInstance(MarkdownRenderer, {}));
+        const renderedTitle = this._register(renderer.render(( new MarkdownString(title))));
+        elements.title.appendChild(renderedTitle.element);
+        const renderedMessage = this._register(renderer.render(( new MarkdownString(message))));
+        elements.message.appendChild(renderedMessage.element);
+        buttons.forEach(buttonData => {
+            const button = ( new Button(
+                elements.buttonsContainer,
+                { ...defaultButtonStyles, secondary: buttonData.isSecondary }
+            ));
+            button.label = buttonData.label;
+            this._register(button.onDidClick(() => this._onDidClick.fire(buttonData)));
+        });
+    }
+};
+ChatConfirmationWidget = ( __decorate([
+    ( __param(3, IInstantiationService))
+], ChatConfirmationWidget));
+export { ChatConfirmationWidget };

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

@@ -7,6 +7,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { EditorInputCapabilities } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { ChatAgentLocation } from '../common/chatAgents.js';
 import { IChatService } from '../common/chatService.service.js';
@@ -49,7 +50,7 @@ let ChatEditorInput = class ChatEditorInput extends EditorInput {
         return ChatEditorInput_1.EditorID;
     }
     get capabilities() {
-        return super.capabilities | 8 ;
+        return super.capabilities | EditorInputCapabilities.Singleton;
     }
     matches(otherInput) {
         return otherInput instanceof ChatEditorInput_1 && ( (otherInput.resource.toString())) === ( (this.resource.toString()));

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

@@ -4,27 +4,21 @@ import { Button } from '../../../../base/browser/ui/button/button.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IChatAgentService } from '../common/chatAgents.service.js';
 import { chatAgentLeader, chatSubcommandLeader } from '../common/chatParserTypes.js';
 const _moduleId = "vs/workbench/contrib/chat/browser/chatFollowups";
 const $ = $$1;
 let ChatFollowups = class ChatFollowups extends Disposable {
-    constructor(container, followups, location, options, clickHandler, contextService, chatAgentService) {
+    constructor(container, followups, location, options, clickHandler, chatAgentService) {
         super();
         this.location = location;
         this.options = options;
         this.clickHandler = clickHandler;
-        this.contextService = contextService;
         this.chatAgentService = chatAgentService;
         const followupsContainer = append(container, $('.interactive-session-followups'));
         followups.forEach(followup => this.renderFollowup(followupsContainer, followup));
     }
     renderFollowup(container, followup) {
-        if (followup.kind === 'command' && followup.when && !this.contextService.contextMatchesRules(ContextKeyExpr.deserialize(followup.when))) {
-            return;
-        }
         if (!this.chatAgentService.getDefaultAgent(this.location)) {
             return;
         }
@@ -42,29 +36,22 @@ let ChatFollowups = class ChatFollowups extends Disposable {
         const baseTitle = followup.kind === 'reply' ?
             (followup.title || followup.message)
             : followup.title;
-        const tooltip = tooltipPrefix +
-            ('tooltip' in followup && followup.tooltip || baseTitle);
-        const button = this._register(( (new Button(container, { ...this.options, supportIcons: true, title: tooltip }))));
+        const message = followup.kind === 'reply' ? followup.message : followup.title;
+        const tooltip = (tooltipPrefix +
+            ('tooltip' in followup && followup.tooltip || message)).trim();
+        const button = this._register(( (new Button(container, { ...this.options, title: tooltip }))));
         if (followup.kind === 'reply') {
             button.element.classList.add('interactive-followup-reply');
         }
         else if (followup.kind === 'command') {
             button.element.classList.add('interactive-followup-command');
         }
-        button.element.ariaLabel = ( localizeWithPath(_moduleId, 0, "Follow up question: {0}", followup.title));
-        let label = '';
-        if (followup.kind === 'reply') {
-            label = '$(sparkle) ' + baseTitle;
-        }
-        else {
-            label = baseTitle;
-        }
-        button.label = ( (new MarkdownString(label, { supportThemeIcons: true })));
+        button.element.ariaLabel = ( localizeWithPath(_moduleId, 0, "Follow up question: {0}", baseTitle));
+        button.label = ( (new MarkdownString(baseTitle)));
         this._register(button.onDidClick(() => this.clickHandler(followup)));
     }
 };
 ChatFollowups = ( (__decorate([
-    ( (__param(5, IContextKeyService))),
-    ( (__param(6, IChatAgentService)))
+    ( (__param(5, IChatAgentService)))
 ], ChatFollowups)));
 export { ChatFollowups };