@codingame/monaco-vscode-chat-service-override 17.2.0 → 18.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/simpleBrowserEditorOverlay.js

@@ -17,25 +17,30 @@ import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vsco
 import { joinPath, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
-import { showChatView } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
+import { ButtonWithDropdown, Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { addDisposableListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { cleanupOldImages, createFileForMedia } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { cleanupOldImages, createFileForMedia } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
-import { observableSignalFromEvent, observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import { IBrowserElementsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/browserElements/browser/browserElementsService.service';
+import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
+import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { BrowserType } from '../../../../../platform/browserElements/common/browserElements.js';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
+import { derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
 registerCss(simpleBrowserOverlay);
 let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
-    constructor(_editor, _container, _hostService, _chatWidgetService, _viewService, fileService, environmentService, logService, configurationService, _preferencesService) {
+    constructor(_editor, _container, _hostService, _chatWidgetService, _viewService, fileService, environmentService, logService, configurationService, _preferencesService, _browserElementsService, contextMenuService) {
         this._editor = _editor;
         this._container = _container;
         this._hostService = _hostService;
@@ -46,8 +51,11 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         this.logService = logService;
         this.configurationService = configurationService;
         this._preferencesService = _preferencesService;
+        this._browserElementsService = _browserElementsService;
+        this.contextMenuService = contextMenuService;
         this._showStore = ( new DisposableStore());
         this._timeout = undefined;
+        this._activeBrowserType = undefined;
         this._showStore.add(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('chat.sendElementsToChat.enabled')) {
                 if (this.configurationService.getValue('chat.sendElementsToChat.enabled')) {
@@ -63,30 +71,67 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         this._domNode = document.createElement('div');
         this._domNode.className = 'element-selection-message';
         const message = document.createElement('span');
-        const startSelectionMessage = ( localize(4761, 'Add element to chat'));
+        const startSelectionMessage = ( localize(4804, 'Add element to chat'));
         message.textContent = startSelectionMessage;
         this._domNode.appendChild(message);
         let cts;
-        const selectButton = this._showStore.add(( new Button(
-            this._domNode,
-            { ...defaultButtonStyles, supportIcons: true, title: ( localize(4762, 'Click to select an element.')) }
-        )));
-        selectButton.element.className = 'element-selection-start';
-        selectButton.label = ( localize(4763, 'Start'));
+        const actions = [];
+        actions.push(toAction({
+            id: 'singleSelection',
+            label: ( localize(4805, 'Select an Element')),
+            enabled: true,
+            run: async () => { await startElementSelection(); }
+        }), toAction({
+            id: 'continuousSelection',
+            label: ( localize(4806, 'Continuous Selection')),
+            enabled: true,
+            run: async () => {
+                this._editor.focus();
+                cts = ( new CancellationTokenSource());
+                message.textContent = ( localize(4807, 'Selecting element...'));
+                this.hideElement(startButton.element);
+                this.showElement(cancelButton.element);
+                cancelButton.label = ( localize(4808, 'Done'));
+                while (!cts.token.isCancellationRequested) {
+                    try {
+                        await this.addElementToChat(cts);
+                    }
+                    catch (err) {
+                        this.logService.error('Failed to select this element.', err);
+                        cts.cancel();
+                        break;
+                    }
+                }
+                message.textContent = ( localize(4809, 'Element added to chat'));
+                finishedSelecting();
+            }
+        }));
+        const startButton = this._showStore.add(( new ButtonWithDropdown(this._domNode, {
+            actions: actions,
+            addPrimaryActionToDropdown: false,
+            contextMenuProvider: this.contextMenuService,
+            supportShortLabel: true,
+            title: ( localize(4810, 'Click to select an element.')),
+            supportIcons: true,
+            ...defaultButtonStyles
+        })));
+        startButton.primaryButton.label = ( localize(4811, 'Start'));
+        startButton.element.classList.add('element-selection-start');
         const cancelButton = this._showStore.add(( new Button(
             this._domNode,
-            { ...defaultButtonStyles, supportIcons: true, title: ( localize(4764, 'Click to cancel selection.')) }
+            { ...defaultButtonStyles, supportIcons: true, title: ( localize(4812, 'Click to cancel selection.')) }
         )));
         cancelButton.element.className = 'element-selection-cancel hidden';
-        cancelButton.label = ( localize(4765, 'Cancel'));
-        const configure = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4766, "Configure Attachments Sent")) })));
+        const cancelButtonLabel = ( localize(4813, 'Cancel'));
+        cancelButton.label = cancelButtonLabel;
+        const configure = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4814, "Configure Attachments Sent")) })));
         configure.icon = Codicon.gear;
-        const collapseOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4767, "Collapse Overlay")) })));
+        const collapseOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4815, "Collapse Overlay")) })));
         collapseOverlay.icon = Codicon.chevronRight;
-        const nextSelection = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4768, "Select Again")) })));
+        const nextSelection = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4816, "Select Again")) })));
         nextSelection.icon = Codicon.close;
         nextSelection.element.classList.add('hidden');
-        const expandOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4769, "Expand Overlay")) })));
+        const expandOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4817, "Expand Overlay")) })));
         expandOverlay.icon = Codicon.layout;
         const expandContainer = document.createElement('div');
         expandContainer.className = 'element-expand-container hidden';
@@ -94,11 +139,12 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         this._container.appendChild(expandContainer);
         const resetButtons = () => {
             this.hideElement(nextSelection.element);
-            this.showElement(selectButton.element);
+            this.showElement(startButton.element);
             this.showElement(collapseOverlay.element);
         };
         const finishedSelecting = () => {
             this.hideElement(cancelButton.element);
+            cancelButton.label = cancelButtonLabel;
             this.hideElement(collapseOverlay.element);
             this.showElement(nextSelection.element);
             this._timeout = setTimeout(() => {
@@ -106,19 +152,22 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
                 resetButtons();
             }, 3000);
         };
-        this._showStore.add(addDisposableListener(selectButton.element, 'click', async () => {
+        const startElementSelection = async () => {
             cts = ( new CancellationTokenSource());
             this._editor.focus();
-            message.textContent = ( localize(4770, 'Selecting element...'));
-            this.hideElement(selectButton.element);
+            message.textContent = ( localize(4807, 'Selecting element...'));
+            this.hideElement(startButton.element);
             this.showElement(cancelButton.element);
             await this.addElementToChat(cts);
-            message.textContent = ( localize(4771, 'Element added to chat'));
+            message.textContent = ( localize(4809, 'Element added to chat'));
             finishedSelecting();
+        };
+        this._showStore.add(addDisposableListener(startButton.primaryButton.element, 'click', async () => {
+            await startElementSelection();
         }));
         this._showStore.add(addDisposableListener(cancelButton.element, 'click', () => {
             cts.cancel();
-            message.textContent = ( localize(4772, 'Selection canceled'));
+            message.textContent = ( localize(4818, 'Selection canceled'));
             finishedSelecting();
         }));
         this._showStore.add(addDisposableListener(collapseOverlay.element, 'click', () => {
@@ -138,6 +187,9 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
             this._preferencesService.openSettings({ jsonEditor: false, query: '@id:chat.sendElementsToChat.enabled,chat.sendElementsToChat.attachCSS,chat.sendElementsToChat.attachImages' });
         }));
     }
+    setActiveBrowserType(type) {
+        this._activeBrowserType = type;
+    }
     hideElement(element) {
         if (element.classList.contains('hidden')) {
             return;
@@ -153,13 +205,13 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
     async addElementToChat(cts) {
         const editorContainer = this._container.querySelector('.editor-container');
         const editorContainerPosition = editorContainer ? editorContainer.getBoundingClientRect() : this._container.getBoundingClientRect();
-        const elementData = await this._hostService.getElementData(editorContainerPosition, cts.token);
+        const elementData = await this._browserElementsService.getElementData(editorContainerPosition, cts.token, this._activeBrowserType);
         if (!elementData) {
             throw ( new Error('Element data not found'));
         }
         const bounds = elementData.bounds;
         const toAttach = [];
-        const widget = this._chatWidgetService.lastFocusedWidget ?? (await showChatView(this._viewService));
+        const widget = (await showChatView(this._viewService)) ?? this._chatWidgetService.lastFocusedWidget;
         let value = 'Attached HTML and CSS Context\n\n' + elementData.outerHTML;
         if (this.configurationService.getValue('chat.sendElementsToChat.attachCSS')) {
             value += '\n\n' + elementData.computedStyle;
@@ -219,11 +271,14 @@ SimpleBrowserOverlayWidget = ( __decorate([
     ( __param(6, IEnvironmentService)),
     ( __param(7, ILogService)),
     ( __param(8, IConfigurationService)),
-    ( __param(9, IPreferencesService))
+    ( __param(9, IPreferencesService)),
+    ( __param(10, IBrowserElementsService)),
+    ( __param(11, IContextMenuService))
 ], SimpleBrowserOverlayWidget));
 let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
-    constructor(container, group, instaService, configurationService) {
+    constructor(container, group, instaService, configurationService, _browserElementsService) {
         this.configurationService = configurationService;
+        this._browserElementsService = _browserElementsService;
         this._store = ( new DisposableStore());
         this._domNode = document.createElement('div');
         if (!this.configurationService.getValue('chat.sendElementsToChat.enabled')) {
@@ -238,21 +293,50 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
         this._domNode.appendChild(widget.getDomNode());
         this._store.add(toDisposable(() => this._domNode.remove()));
         this._store.add(widget);
-        const show = () => {
+        const connectingWebviewElement = document.createElement('div');
+        connectingWebviewElement.className = 'connecting-webview-element';
+        const getActiveBrowserType = () => {
+            const editor = group.activeEditorPane;
+            const isSimpleBrowser = editor?.input.editorId === 'mainThreadWebview-simpleBrowser.view';
+            const isLiveServer = editor?.input.editorId === 'mainThreadWebview-browserPreview';
+            return isSimpleBrowser ? BrowserType.SimpleBrowser : isLiveServer ? BrowserType.LiveServer : undefined;
+        };
+        let cts = ( new CancellationTokenSource());
+        const show = async () => {
+            connectingWebviewElement.textContent = ( localize(4819, 'Connecting to webview...'));
+            if (!container.contains(connectingWebviewElement)) {
+                container.appendChild(connectingWebviewElement);
+            }
+            cts = ( new CancellationTokenSource());
+            const activeBrowserType = getActiveBrowserType();
+            if (activeBrowserType) {
+                try {
+                    await this._browserElementsService.startDebugSession(cts.token, activeBrowserType);
+                }
+                catch (error) {
+                    connectingWebviewElement.textContent = ( localize(4820, 'Please reopen the preview.'));
+                    return;
+                }
+            }
             if (!container.contains(this._domNode)) {
                 container.appendChild(this._domNode);
             }
+            connectingWebviewElement.remove();
         };
         const hide = () => {
             if (container.contains(this._domNode)) {
+                cts.cancel();
                 this._domNode.remove();
             }
+            connectingWebviewElement.remove();
         };
         const activeEditorSignal = observableSignalFromEvent(this, Event.any(group.onDidActiveEditorChange, group.onDidModelChange));
         const activeUriObs = derivedOpts({ equalsFn: isEqual }, r => {
             activeEditorSignal.read(r);
             const editor = group.activeEditorPane;
-            if (editor?.input.editorId === 'mainThreadWebview-simpleBrowser.view') {
+            const activeBrowser = getActiveBrowserType();
+            widget.setActiveBrowserType(activeBrowser);
+            if (activeBrowser) {
                 const uri = EditorResourceAccessor.getOriginalUri(editor?.input, { supportSideBySide: SideBySideEditor.PRIMARY });
                 return uri;
             }
@@ -273,7 +357,8 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
 };
 SimpleBrowserOverlayController = ( __decorate([
     ( __param(2, IInstantiationService)),
-    ( __param(3, IConfigurationService))
+    ( __param(3, IConfigurationService)),
+    ( __param(4, IBrowserElementsService))
 ], SimpleBrowserOverlayController));
 let SimpleBrowserOverlay = class SimpleBrowserOverlay {
     static { this.ID = 'chat.simpleBrowser.overlay'; }

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

@@ -7,11 +7,11 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { EditorPane } from "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common/vscode/vs/workbench/browser/parts/editor/editorPane";
 import { IEditorOpenContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IEditorGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
 import { IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { ChatEditorInput } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
+import { ChatEditorInput } from "@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
 export interface IChatEditorOptions extends IEditorOptions {
     target?: {
         sessionId: string;

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

@@ -18,13 +18,13 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { EditorPane } from '@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/parts/editor/editorPane';
-import { Memento } from '@codingame/monaco-vscode-25a9b730-95ad-54d3-8807-71421ad9b891-common/vscode/vs/workbench/common/memento';
+import { EditorPane } from '@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common/vscode/vs/workbench/browser/parts/editor/editorPane';
+import { Memento } from '@codingame/monaco-vscode-924e8f00-6faf-5059-b518-e43427d29ab3-common/vscode/vs/workbench/common/memento';
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { ChatAgentLocation, ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { clearChatEditor } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
-import { ChatEditorInput } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { clearChatEditor } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
+import { ChatEditorInput } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 
 let ChatEditor = class ChatEditor extends EditorPane {

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

@@ -1,16 +1,14 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
 export declare class ChatExtensionPointHandler implements IWorkbenchContribution {
     private readonly _chatAgentService;
-    private readonly logService;
     static readonly ID = "workbench.contrib.chatExtensionPointHandler";
     private _participantRegistrationDisposables;
-    constructor(_chatAgentService: IChatAgentService, logService: ILogService);
+    constructor(_chatAgentService: IChatAgentService);
     private handleAndRegisterChatExtensions;
 }
 export declare class ChatCompatibilityNotifier extends Disposable implements IWorkbenchContribution {