@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -1,19 +1,29 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { $ } from '../../../../base/browser/dom.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { revive } from '../../../../base/common/marshalling.js';
 import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
-import { ChatRequestTextPart, ChatRequestDynamicVariablePart, ChatRequestAgentPart } from '../common/chatParserTypes.js';
+import { ChatAgentHover } from './chatAgentHover.js';
+import { IChatAgentService } from '../common/chatAgents.service.js';
+import { ChatRequestTextPart, ChatRequestAgentPart, ChatRequestDynamicVariablePart } from '../common/chatParserTypes.js';
 import { contentRefUrl } from '../common/annotations.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 const variableRefUrl = 'http://_vscodedecoration_';
+const agentRefUrl = 'http://_chatagent_';
 let ChatMarkdownDecorationsRenderer = class ChatMarkdownDecorationsRenderer {
-    constructor(keybindingService, labelService, logService) {
+    constructor(keybindingService, labelService, logService, chatAgentService, instantiationService, hoverService) {
         this.keybindingService = keybindingService;
         this.labelService = labelService;
         this.logService = logService;
+        this.chatAgentService = chatAgentService;
+        this.instantiationService = instantiationService;
+        this.hoverService = hoverService;
     }
     convertParsedRequestToMarkdown(parsedRequest) {
         let result = '';
@@ -21,22 +31,36 @@ let ChatMarkdownDecorationsRenderer = class ChatMarkdownDecorationsRenderer {
             if (part instanceof ChatRequestTextPart) {
                 result += part.text;
             }
+            else if (part instanceof ChatRequestAgentPart) {
+                let text = part.text;
+                const isDupe = this.chatAgentService.getAgentsByName(part.agent.name).length > 1;
+                if (isDupe) {
+                    text += ` (${part.agent.extensionPublisherDisplayName})`;
+                }
+                result += `[${text}](${agentRefUrl}?${encodeURIComponent(part.agent.id)})`;
+            }
             else {
                 const uri = part instanceof ChatRequestDynamicVariablePart && ( part.data.map(d => d.value)).find((d) => d instanceof URI)
                     || undefined;
                 const title = uri ? encodeURIComponent(this.labelService.getUriLabel(uri, { relative: true })) :
                     part instanceof ChatRequestAgentPart ? part.agent.id :
                         '';
-                result += `[${part.text}](${variableRefUrl}?${title})`;
+                const text = part.text;
+                result += `[${text}](${variableRefUrl}?${title})`;
             }
         }
         return result;
     }
     walkTreeAndAnnotateReferenceLinks(element) {
+        const store = ( new DisposableStore());
         element.querySelectorAll('a').forEach(a => {
             const href = a.getAttribute('data-href');
             if (href) {
-                if (href.startsWith(variableRefUrl)) {
+                if (href.startsWith(agentRefUrl)) {
+                    const title = decodeURIComponent(href.slice(agentRefUrl.length + 1));
+                    a.parentElement.replaceChild(this.renderAgentWidget(a.textContent, title, store), a);
+                }
+                else if (href.startsWith(variableRefUrl)) {
                     const title = decodeURIComponent(href.slice(variableRefUrl.length + 1));
                     a.parentElement.replaceChild(this.renderResourceWidget(a.textContent, title), a);
                 }
@@ -48,6 +72,16 @@ let ChatMarkdownDecorationsRenderer = class ChatMarkdownDecorationsRenderer {
                 }
             }
         });
+        return store;
+    }
+    renderAgentWidget(name, id, store) {
+        const container = $('span.chat-resource-widget', undefined, $('span', undefined, name));
+        store.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('element'), container, () => {
+            const hover = store.add(this.instantiationService.createInstance(ChatAgentHover));
+            hover.setAgent(id);
+            return hover.domNode;
+        }));
+        return container;
     }
     renderFileWidget(href, a) {
         const fullUri = ( URI.parse(href));
@@ -93,6 +127,9 @@ let ChatMarkdownDecorationsRenderer = class ChatMarkdownDecorationsRenderer {
 ChatMarkdownDecorationsRenderer = ( __decorate([
     ( __param(0, IKeybindingService)),
     ( __param(1, ILabelService)),
-    ( __param(2, ILogService))
+    ( __param(2, ILogService)),
+    ( __param(3, IChatAgentService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IHoverService))
 ], ChatMarkdownDecorationsRenderer));
 export { ChatMarkdownDecorationsRenderer };

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { getTotalHeight, append, scheduleAtNextAnimationFrame, getWindow, Dimension, $ as $$1 } from '../../../../base/browser/dom.js';
+import { append, scheduleAtNextAnimationFrame, getWindow, Dimension, $ as $$1 } from '../../../../base/browser/dom.js';
 import { timeout, disposableTimeout } from '../../../../base/common/async.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
@@ -8,6 +8,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { isDefined } from '../../../../base/common/types.js';
 import './media/chat.css.js';
+import './media/chatAgentHover.css.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -24,7 +25,6 @@ import { ChatListDelegate, ChatListItemRenderer } from './chatListRenderer.js';
 import { ChatEditorOptions } from './chatOptions.js';
 import { IChatAgentService } from '../common/chatAgents.service.js';
 import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_RESPONSE_FILTERED } from '../common/chatContextKeys.js';
-import { IChatContributionService } from '../common/chatContributionService.service.js';
 import { ChatModelInitState } from '../common/chatModel.js';
 import { ChatRequestAgentPart, extractAgentAndCommand, chatAgentLeader, chatSubcommandLeader } from '../common/chatParserTypes.js';
 import { ChatRequestParser } from '../common/chatRequestParser.js';
@@ -32,7 +32,6 @@ import { IChatService } from '../common/chatService.service.js';
 import { IChatSlashCommandService } from '../common/chatSlashCommands.service.js';
 import { isResponseVM, isRequestVM, isWelcomeVM, ChatViewModel } from '../common/chatViewModel.js';
 import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
-import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 var ChatWidget_1;
 const $ = $$1;
 function revealLastElement(list) {
@@ -151,9 +150,6 @@ let ChatWidget = class ChatWidget extends Disposable {
     get supportsFileReferences() {
         return !!this.viewOptions.supportsFileReferences;
     }
-    get providerId() {
-        return this.viewModel?.providerId || '';
-    }
     get input() {
         return this.inputPart;
     }
@@ -164,23 +160,24 @@ let ChatWidget = class ChatWidget extends Disposable {
         return this.inputPart.inputUri;
     }
     get contentHeight() {
-        return getTotalHeight(this.inputPart.element) + this.tree.contentHeight;
+        return this.inputPart.contentHeight + this.tree.contentHeight;
     }
     render(parent) {
         const viewId = 'viewId' in this.viewContext ? this.viewContext.viewId : undefined;
         this.editorOptions = this._register(this.instantiationService.createInstance(ChatEditorOptions, viewId, this.styles.listForeground, this.styles.inputEditorBackground, this.styles.resultEditorBackground));
         const renderInputOnTop = this.viewOptions.renderInputOnTop ?? false;
+        const renderFollowups = this.viewOptions.renderFollowups ?? !renderInputOnTop;
         const renderStyle = this.viewOptions.renderStyle;
         this.container = append(parent, $('.interactive-session'));
         if (renderInputOnTop) {
-            this.createInput(this.container, { renderFollowups: false, renderStyle });
+            this.createInput(this.container, { renderFollowups, renderStyle });
             this.listContainer = append(this.container, $(`.interactive-list`));
         }
         else {
             this.listContainer = append(this.container, $(`.interactive-list`));
-            this.createInput(this.container, { renderFollowups: true, renderStyle });
+            this.createInput(this.container, { renderFollowups, renderStyle });
         }
-        this.createList(this.listContainer, { renderStyle, editableCodeBlock: this.viewOptions.editableCodeBlocks });
+        this.createList(this.listContainer, { ...this.viewOptions.rendererOptions, renderStyle });
         this._register(this.editorOptions.onDidChange(() => this.onDidStyleChange()));
         this.onDidStyleChange();
         if (this.viewModel) {
@@ -406,7 +403,6 @@ let ChatWidget = class ChatWidget extends Disposable {
                 return;
             }
             this.chatService.notifyUserAction({
-                providerId: this.viewModel.providerId,
                 sessionId: this.viewModel.sessionId,
                 requestId: e.response.requestId,
                 agentId: e.response.agent?.id,
@@ -452,7 +448,7 @@ let ChatWidget = class ChatWidget extends Disposable {
     }
     setModel(model, viewState) {
         if (!this.container) {
-            throw new Error('Call render() before setModel()');
+            throw ( new Error('Call render() before setModel()'));
         }
         this._codeBlockModelCollection.clear();
         this.container.setAttribute('data-session-id', model.sessionId);
@@ -463,7 +459,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             }
             this.requestInProgress.set(this.viewModel.requestInProgress);
             this.onDidChangeItems();
-            if (( events.some(e => e?.kind === 'addRequest'))) {
+            if (( events.some(e => e?.kind === 'addRequest')) && this.visible) {
                 revealLastElement(this.tree);
                 this.focusInput();
             }
@@ -473,7 +469,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.viewModel = undefined;
             this.onDidChangeItems();
         }));
-        this.inputPart.setState(model.providerId, viewState.inputValue);
+        this.inputPart.setState(viewState.inputValue);
         this.contribs.forEach(c => {
             if (c.setInputState && viewState.inputState?.[c.id]) {
                 c.setInputState(viewState.inputState?.[c.id]);
@@ -539,7 +535,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 'query' in opts ? opts.query :
                     `${opts.prefix} ${editorValue}`;
             const isUserQuery = !opts || 'prefix' in opts;
-            const result = await this.chatService.sendRequest(this.viewModel.sessionId, input, this.inputPart.implicitContextEnabled, this.location, { selectedAgent: this._lastSelectedAgent });
+            const result = await this.chatService.sendRequest(this.viewModel.sessionId, input, { implicitVariablesEnabled: this.inputPart.implicitContextEnabled, location: this.location, parserContext: { selectedAgent: this._lastSelectedAgent } });
             if (result) {
                 const inputState = this.collectInputState();
                 this.inputPart.acceptInput(isUserQuery ? input : undefined, isUserQuery ? inputState : undefined);
@@ -685,13 +681,11 @@ ChatWidget = ChatWidget_1 = ( __decorate([
     ( __param(13, IThemeService)),
     ( __param(14, IChatSlashCommandService))
 ], ChatWidget));
-let ChatWidgetService = class ChatWidgetService {
+class ChatWidgetService {
     get lastFocusedWidget() {
         return this._lastFocusedWidget;
     }
-    constructor(viewsService, chatContributionService) {
-        this.viewsService = viewsService;
-        this.chatContributionService = chatContributionService;
+    constructor() {
         this._widgets = [];
         this._lastFocusedWidget = undefined;
     }
@@ -701,11 +695,6 @@ let ChatWidgetService = class ChatWidgetService {
     getWidgetBySessionId(sessionId) {
         return this._widgets.find(w => w.viewModel?.sessionId === sessionId);
     }
-    async revealViewForProvider(providerId) {
-        const viewId = this.chatContributionService.getViewIdForProvider(providerId);
-        const view = await this.viewsService.openView(viewId);
-        return view?.widget;
-    }
     setLastFocusedWidget(widget) {
         if (widget === this._lastFocusedWidget) {
             return;
@@ -714,14 +703,10 @@ let ChatWidgetService = class ChatWidgetService {
     }
     register(newWidget) {
         if (( this._widgets.some(widget => widget === newWidget))) {
-            throw new Error('Cannot register the same widget multiple times');
+            throw ( new Error('Cannot register the same widget multiple times'));
         }
         this._widgets.push(newWidget);
         return combinedDisposable(newWidget.onDidFocus(() => this.setLastFocusedWidget(newWidget)), toDisposable(() => this._widgets.splice(this._widgets.indexOf(newWidget), 1)));
     }
-};
-ChatWidgetService = ( __decorate([
-    ( __param(0, IViewsService)),
-    ( __param(1, IChatContributionService))
-], ChatWidgetService));
+}
 export { ChatWidget, ChatWidgetService };

package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".interactive-result-code-block{position:relative}.interactive-result-code-block .monaco-toolbar{background-color:var(--vscode-interactive-result-editor-background-color,var(--vscode-editor-background));border:1px solid var(--vscode-chat-requestBorder);display:none;height:26px;position:absolute;right:10px;top:-13px;z-index:100}.interactive-result-code-block .monaco-toolbar .action-item{height:24px;margin:1px 2px;width:24px}.interactive-result-code-block .monaco-toolbar .action-item .codicon{margin:1px}.interactive-result-code-block .monaco-toolbar:focus-within,.interactive-result-code-block.focused .monaco-toolbar,.interactive-result-code-block:hover .monaco-toolbar{border-radius:2px;display:initial}.interactive-result-code-block .interactive-result-code-block-toolbar.force-visibility .monaco-toolbar{display:initial!important}.interactive-result-code-block{background-color:var(--vscode-interactive-result-editor-background-color);border:1px solid var(--vscode-input-border,transparent);margin:16px 0}.interactive-result-code-block:has(.monaco-editor.focused){border-color:var(--vscode-focusBorder,transparent)}.interactive-result-code-block,.interactive-result-code-block .monaco-editor,.interactive-result-code-block .monaco-editor .overflow-guard{border-radius:4px}.interactive-result-code-block .interactive-result-vulns{font-size:.9em;padding:0 8px 2px}.interactive-result-code-block .interactive-result-vulns-header{display:flex;height:22px}.interactive-result-code-block .interactive-result-vulns-header,.interactive-result-code-block .interactive-result-vulns-list{opacity:.8}.interactive-result-code-block .interactive-result-vulns-list{margin:0;padding-bottom:3px;padding-left:16px!important}.interactive-result-code-block.chat-vulnerabilities-collapsed .interactive-result-vulns-list{display:none}.interactive-result-code-block .interactive-result-vulns-list .chat-vuln-title{font-weight:700}.interactive-result-code-block.no-vulns .interactive-result-vulns{display:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-button{border:none;color:var(--vscode-foreground)!important;display:inline-flex;justify-content:normal;padding:0;text-align:initial;user-select:none;width:100%}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus{outline:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus-visible{outline:1px solid var(--vscode-focusBorder)}";
+var css = ".interactive-result-code-block{position:relative}.interactive-result-code-block .monaco-toolbar{background-color:var(--vscode-interactive-result-editor-background-color,var(--vscode-editor-background));border:1px solid var(--vscode-chat-requestBorder);display:none;height:26px;position:absolute;right:10px;top:-13px;z-index:100}.interactive-result-code-block .monaco-toolbar .action-item{height:24px;margin:1px 2px;width:24px}.interactive-result-code-block .monaco-toolbar .action-item .codicon{margin:1px}.interactive-result-code-block .monaco-toolbar:focus-within,.interactive-result-code-block.focused .monaco-toolbar,.interactive-result-code-block:hover .monaco-toolbar{border-radius:2px;display:initial}.interactive-result-code-block .interactive-result-code-block-toolbar.force-visibility .monaco-toolbar{display:initial!important}.interactive-item-container .value .rendered-markdown [data-code]{margin:16px 0}.interactive-result-code-block{background-color:var(--vscode-interactive-result-editor-background-color);border:1px solid var(--vscode-input-border,transparent)}.interactive-result-code-block:has(.monaco-editor.focused){border-color:var(--vscode-focusBorder,transparent)}.interactive-result-code-block,.interactive-result-code-block .monaco-editor,.interactive-result-code-block .monaco-editor .overflow-guard{border-radius:4px}.interactive-result-code-block .interactive-result-vulns{font-size:.9em;padding:0 8px 2px}.interactive-result-code-block .interactive-result-vulns-header{display:flex;height:22px}.interactive-result-code-block .interactive-result-vulns-header,.interactive-result-code-block .interactive-result-vulns-list{opacity:.8}.interactive-result-code-block .interactive-result-vulns-list{margin:0;padding-bottom:3px;padding-left:16px!important}.interactive-result-code-block.chat-vulnerabilities-collapsed .interactive-result-vulns-list{display:none}.interactive-result-code-block .interactive-result-vulns-list .chat-vuln-title{font-weight:700}.interactive-result-code-block.no-vulns .interactive-result-vulns{display:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-button{border:none;color:var(--vscode-foreground)!important;display:inline-flex;justify-content:normal;padding:0;text-align:initial;user-select:none;width:100%}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus{outline:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus-visible{outline:1px solid var(--vscode-focusBorder)}.interactive-result-code-block.compare.no-diff .message{display:inherit}.interactive-result-code-block.compare .message{display:none;padding:6px}.interactive-result-code-block.compare .message A{color:var(--vscode-textLink-foreground);cursor:pointer}";
 n(css,{});
 export { css, css as default };