@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

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

@@ -0,0 +1,129 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
+import { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
+import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
+import { CellEditState } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+
+let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {
+    constructor(notebookEditor, notebookModel, instantiationService, accessibilitySignalService) {
+        super();
+        this.notebookEditor = notebookEditor;
+        this.notebookModel = notebookModel;
+        this.instantiationService = instantiationService;
+        this.accessibilitySignalService = accessibilitySignalService;
+        this._timeout = undefined;
+        this.overlayDisposables = this._register(( new DisposableStore()));
+    }
+    decorate(changes) {
+        if (this._timeout !== undefined) {
+            clearTimeout(this._timeout);
+        }
+        this._timeout = setTimeout(() => {
+            this._timeout = undefined;
+            this.createMarkdownPreviewToolbars(changes);
+        }, 100);
+    }
+    createMarkdownPreviewToolbars(changes) {
+        this.overlayDisposables.clear();
+        const accessibilitySignalService = this.accessibilitySignalService;
+        const editor = this.notebookEditor;
+        for (const change of changes) {
+            const cellViewModel = this.getCellViewModel(change);
+            if (!cellViewModel || cellViewModel.cellKind !== CellKind.Markup) {
+                continue;
+            }
+            const toolbarContainer = document.createElement('div');
+            let overlayId = undefined;
+            editor.changeCellOverlays((accessor) => {
+                toolbarContainer.style.right = '44px';
+                overlayId = accessor.addOverlay({
+                    cell: cellViewModel,
+                    domNode: toolbarContainer,
+                });
+            });
+            const removeOverlay = () => {
+                editor.changeCellOverlays(accessor => {
+                    if (overlayId) {
+                        accessor.removeOverlay(overlayId);
+                    }
+                });
+            };
+            this.overlayDisposables.add({ dispose: removeOverlay });
+            const toolbar = document.createElement('div');
+            toolbarContainer.appendChild(toolbar);
+            toolbar.className = 'chat-diff-change-content-widget';
+            toolbar.classList.add('hover');
+            toolbar.style.position = 'relative';
+            toolbar.style.top = '18px';
+            toolbar.style.zIndex = '10';
+            toolbar.style.display = cellViewModel.getEditState() === CellEditState.Editing ? 'none' : 'block';
+            this.overlayDisposables.add(cellViewModel.onDidChangeState((e) => {
+                if (e.editStateChanged) {
+                    if (cellViewModel.getEditState() === CellEditState.Editing) {
+                        toolbar.style.display = 'none';
+                    }
+                    else {
+                        toolbar.style.display = 'block';
+                    }
+                }
+            }));
+            const scopedInstaService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.notebookEditor.scopedContextKeyService]))));
+            const toolbarWidget = scopedInstaService.createInstance(MenuWorkbenchToolBar, toolbar, MenuId.ChatEditingEditorHunk, {
+                telemetrySource: 'chatEditingNotebookHunk',
+                hiddenItemStrategy: HiddenItemStrategy.NoHide,
+                toolbarOptions: { primaryGroup: () => true },
+                menuOptions: {
+                    renderShortTitle: true,
+                    arg: {
+                        async accept() {
+                            accessibilitySignalService.playSignal(AccessibilitySignal.editsKept, { allowManyInParallel: true });
+                            removeOverlay();
+                            toolbarWidget.dispose();
+                            for (const singleChange of change.diff.get().changes) {
+                                await change.keep(singleChange);
+                            }
+                            return true;
+                        },
+                        async reject() {
+                            accessibilitySignalService.playSignal(AccessibilitySignal.editsUndone, { allowManyInParallel: true });
+                            removeOverlay();
+                            toolbarWidget.dispose();
+                            for (const singleChange of change.diff.get().changes) {
+                                await change.undo(singleChange);
+                            }
+                            return true;
+                        }
+                    },
+                },
+            });
+            this.overlayDisposables.add(toolbarWidget);
+        }
+    }
+    getCellViewModel(change) {
+        if (change.type === 'delete' || change.modifiedCellIndex === undefined) {
+            return undefined;
+        }
+        const cell = this.notebookModel.cells[change.modifiedCellIndex];
+        const cellViewModel = this.notebookEditor.getViewModel()?.viewCells.find(c => c.handle === cell.handle);
+        return cellViewModel;
+    }
+    dispose() {
+        super.dispose();
+        if (this._timeout !== undefined) {
+            clearTimeout(this._timeout);
+        }
+    }
+};
+OverlayToolbarDecorator = ( __decorate([
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IAccessibilitySignalService))
+], OverlayToolbarDecorator));
+
+export { OverlayToolbarDecorator };

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

@@ -0,0 +1,9 @@
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+export declare class SimpleBrowserOverlay implements IWorkbenchContribution {
+    static readonly ID = "chat.simpleBrowser.overlay";
+    private readonly _store;
+    constructor(editorGroupsService: IEditorGroupsService, instantiationService: IInstantiationService);
+    dispose(): void;
+}

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

@@ -0,0 +1,313 @@
+
+import { registerCss } from '@codingame/monaco-vscode-api/css';
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import * as simpleBrowserOverlay from '../media/simpleBrowserOverlay.css';
+import { DisposableStore, toDisposable, DisposableMap, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { EditorGroupView } from '@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+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 { 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 { 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 { 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';
+
+registerCss(simpleBrowserOverlay);
+let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
+    constructor(_editor, _container, _hostService, _chatWidgetService, _viewService, fileService, environmentService, logService, configurationService, _preferencesService) {
+        this._editor = _editor;
+        this._container = _container;
+        this._hostService = _hostService;
+        this._chatWidgetService = _chatWidgetService;
+        this._viewService = _viewService;
+        this.fileService = fileService;
+        this.environmentService = environmentService;
+        this.logService = logService;
+        this.configurationService = configurationService;
+        this._preferencesService = _preferencesService;
+        this._showStore = ( new DisposableStore());
+        this._timeout = undefined;
+        this._showStore.add(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration('chat.sendElementsToChat.enabled')) {
+                if (this.configurationService.getValue('chat.sendElementsToChat.enabled')) {
+                    this.showElement(this._domNode);
+                }
+                else {
+                    this.hideElement(this._domNode);
+                }
+            }
+        }));
+        this.imagesFolder = joinPath(this.environmentService.workspaceStorageHome, 'vscode-chat-images');
+        cleanupOldImages(this.fileService, this.logService, this.imagesFolder);
+        this._domNode = document.createElement('div');
+        this._domNode.className = 'element-selection-message';
+        const message = document.createElement('span');
+        const startSelectionMessage = ( localize(4761, '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 cancelButton = this._showStore.add(( new Button(
+            this._domNode,
+            { ...defaultButtonStyles, supportIcons: true, title: ( localize(4764, '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")) })));
+        configure.icon = Codicon.gear;
+        const collapseOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4767, "Collapse Overlay")) })));
+        collapseOverlay.icon = Codicon.chevronRight;
+        const nextSelection = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4768, "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")) })));
+        expandOverlay.icon = Codicon.layout;
+        const expandContainer = document.createElement('div');
+        expandContainer.className = 'element-expand-container hidden';
+        expandContainer.appendChild(expandOverlay.element);
+        this._container.appendChild(expandContainer);
+        const resetButtons = () => {
+            this.hideElement(nextSelection.element);
+            this.showElement(selectButton.element);
+            this.showElement(collapseOverlay.element);
+        };
+        const finishedSelecting = () => {
+            this.hideElement(cancelButton.element);
+            this.hideElement(collapseOverlay.element);
+            this.showElement(nextSelection.element);
+            this._timeout = setTimeout(() => {
+                message.textContent = startSelectionMessage;
+                resetButtons();
+            }, 3000);
+        };
+        this._showStore.add(addDisposableListener(selectButton.element, 'click', async () => {
+            cts = ( new CancellationTokenSource());
+            this._editor.focus();
+            message.textContent = ( localize(4770, 'Selecting element...'));
+            this.hideElement(selectButton.element);
+            this.showElement(cancelButton.element);
+            await this.addElementToChat(cts);
+            message.textContent = ( localize(4771, 'Element added to chat'));
+            finishedSelecting();
+        }));
+        this._showStore.add(addDisposableListener(cancelButton.element, 'click', () => {
+            cts.cancel();
+            message.textContent = ( localize(4772, 'Selection canceled'));
+            finishedSelecting();
+        }));
+        this._showStore.add(addDisposableListener(collapseOverlay.element, 'click', () => {
+            this.hideElement(this._domNode);
+            this.showElement(expandContainer);
+        }));
+        this._showStore.add(addDisposableListener(expandOverlay.element, 'click', () => {
+            this.showElement(this._domNode);
+            this.hideElement(expandContainer);
+        }));
+        this._showStore.add(addDisposableListener(nextSelection.element, 'click', () => {
+            clearTimeout(this._timeout);
+            message.textContent = startSelectionMessage;
+            resetButtons();
+        }));
+        this._showStore.add(addDisposableListener(configure.element, 'click', () => {
+            this._preferencesService.openSettings({ jsonEditor: false, query: '@id:chat.sendElementsToChat.enabled,chat.sendElementsToChat.attachCSS,chat.sendElementsToChat.attachImages' });
+        }));
+    }
+    hideElement(element) {
+        if (element.classList.contains('hidden')) {
+            return;
+        }
+        element.classList.add('hidden');
+    }
+    showElement(element) {
+        if (!element.classList.contains('hidden')) {
+            return;
+        }
+        element.classList.remove('hidden');
+    }
+    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);
+        if (!elementData) {
+            throw ( new Error('Element data not found'));
+        }
+        const bounds = elementData.bounds;
+        const toAttach = [];
+        const widget = this._chatWidgetService.lastFocusedWidget ?? (await showChatView(this._viewService));
+        let value = 'Attached HTML and CSS Context\n\n' + elementData.outerHTML;
+        if (this.configurationService.getValue('chat.sendElementsToChat.attachCSS')) {
+            value += '\n\n' + elementData.computedStyle;
+        }
+        toAttach.push({
+            id: 'element-' + Date.now(),
+            name: this.getDisplayNameFromOuterHTML(elementData.outerHTML),
+            fullName: this.getDisplayNameFromOuterHTML(elementData.outerHTML),
+            value: value,
+            kind: 'element',
+            icon: ThemeIcon.fromId(Codicon.layout.id),
+        });
+        if (this.configurationService.getValue('chat.sendElementsToChat.attachImages')) {
+            this._domNode.style.display = 'none';
+            await ( new Promise(resolve => setTimeout(resolve, 100)));
+            const screenshot = await this._hostService.getScreenshot(bounds);
+            if (!screenshot) {
+                throw ( new Error('Screenshot failed'));
+            }
+            const fileReference = await createFileForMedia(this.fileService, this.imagesFolder, screenshot.buffer, 'image/png');
+            toAttach.push({
+                id: 'element-screenshot-' + Date.now(),
+                name: 'Element Screenshot',
+                fullName: 'Element Screenshot',
+                kind: 'image',
+                value: screenshot.buffer,
+                references: fileReference ? [{ reference: fileReference, kind: 'reference' }] : [],
+            });
+            this._domNode.style.display = '';
+        }
+        widget?.attachmentModel?.addContext(...toAttach);
+    }
+    getDisplayNameFromOuterHTML(outerHTML) {
+        const firstElementMatch = outerHTML.match(/^<(\w+)([^>]*?)>/);
+        if (!firstElementMatch) {
+            throw ( new Error('No outer element found'));
+        }
+        const tagName = firstElementMatch[1];
+        const idMatch = firstElementMatch[2].match(/\s+id\s*=\s*["']([^"']+)["']/i);
+        const id = idMatch ? `#${idMatch[1]}` : '';
+        const classMatch = firstElementMatch[2].match(/\s+class\s*=\s*["']([^"']+)["']/i);
+        const className = classMatch ? `.${classMatch[1].replace(/\s+/g, '.')}` : '';
+        return `${tagName}${id}${className}`;
+    }
+    dispose() {
+        this._showStore.dispose();
+    }
+    getDomNode() {
+        return this._domNode;
+    }
+};
+SimpleBrowserOverlayWidget = ( __decorate([
+    ( __param(2, IHostService)),
+    ( __param(3, IChatWidgetService)),
+    ( __param(4, IViewsService)),
+    ( __param(5, IFileService)),
+    ( __param(6, IEnvironmentService)),
+    ( __param(7, ILogService)),
+    ( __param(8, IConfigurationService)),
+    ( __param(9, IPreferencesService))
+], SimpleBrowserOverlayWidget));
+let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
+    constructor(container, group, instaService, configurationService) {
+        this.configurationService = configurationService;
+        this._store = ( new DisposableStore());
+        this._domNode = document.createElement('div');
+        if (!this.configurationService.getValue('chat.sendElementsToChat.enabled')) {
+            return;
+        }
+        this._domNode.classList.add('chat-simple-browser-overlay');
+        this._domNode.style.position = 'absolute';
+        this._domNode.style.bottom = `5px`;
+        this._domNode.style.right = `5px`;
+        this._domNode.style.zIndex = `100`;
+        const widget = instaService.createInstance(SimpleBrowserOverlayWidget, group, container);
+        this._domNode.appendChild(widget.getDomNode());
+        this._store.add(toDisposable(() => this._domNode.remove()));
+        this._store.add(widget);
+        const show = () => {
+            if (!container.contains(this._domNode)) {
+                container.appendChild(this._domNode);
+            }
+        };
+        const hide = () => {
+            if (container.contains(this._domNode)) {
+                this._domNode.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 uri = EditorResourceAccessor.getOriginalUri(editor?.input, { supportSideBySide: SideBySideEditor.PRIMARY });
+                return uri;
+            }
+            return undefined;
+        });
+        this._store.add(autorun(r => {
+            const data = activeUriObs.read(r);
+            if (!data) {
+                hide();
+                return;
+            }
+            show();
+        }));
+    }
+    dispose() {
+        this._store.dispose();
+    }
+};
+SimpleBrowserOverlayController = ( __decorate([
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IConfigurationService))
+], SimpleBrowserOverlayController));
+let SimpleBrowserOverlay = class SimpleBrowserOverlay {
+    static { this.ID = 'chat.simpleBrowser.overlay'; }
+    constructor(editorGroupsService, instantiationService) {
+        this._store = ( new DisposableStore());
+        const editorGroups = observableFromEvent(this, Event.any(editorGroupsService.onDidAddGroup, editorGroupsService.onDidRemoveGroup), () => editorGroupsService.groups);
+        const overlayWidgets = ( new DisposableMap());
+        this._store.add(autorun(r => {
+            const toDelete = ( new Set(( overlayWidgets.keys())));
+            const groups = editorGroups.read(r);
+            for (const group of groups) {
+                if (!(group instanceof EditorGroupView)) {
+                    continue;
+                }
+                toDelete.delete(group);
+                if (!( overlayWidgets.has(group))) {
+                    const scopedInstaService = instantiationService.createChild(( new ServiceCollection([IContextKeyService, group.scopedContextKeyService])));
+                    const container = group.element;
+                    const ctrl = scopedInstaService.createInstance(SimpleBrowserOverlayController, container, group);
+                    overlayWidgets.set(group, combinedDisposable(ctrl, scopedInstaService));
+                }
+            }
+            for (const group of toDelete) {
+                overlayWidgets.deleteAndDispose(group);
+            }
+        }));
+    }
+    dispose() {
+        this._store.dispose();
+    }
+};
+SimpleBrowserOverlay = ( __decorate([
+    ( __param(0, IEditorGroupsService)),
+    ( __param(1, IInstantiationService))
+], SimpleBrowserOverlay));
+
+export { SimpleBrowserOverlay };

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

@@ -7,12 +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-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { ChatEditorInput } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
+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";
 export interface IChatEditorOptions extends IEditorOptions {
     target?: {
         sessionId: string;
@@ -24,13 +23,12 @@ export declare class ChatEditor extends EditorPane {
     private readonly instantiationService;
     private readonly storageService;
     private readonly contextKeyService;
-    private readonly chatService;
     private widget;
     private _scopedContextKeyService;
     get scopedContextKeyService(): IScopedContextKeyService;
     private _memento;
     private _viewState;
-    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, instantiationService: IInstantiationService, storageService: IStorageService, contextKeyService: IContextKeyService, chatService: IChatService);
+    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, instantiationService: IInstantiationService, storageService: IStorageService, contextKeyService: IContextKeyService);
     private clear;
     protected createEditor(parent: HTMLElement): void;
     protected setEditorVisible(visible: boolean): void;

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

@@ -18,26 +18,24 @@ 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-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/editor/editorPane';
-import { Memento } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/common/memento';
+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-c8227507-8e59-53d6-b50b-71c0ab384cf4-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
-import { ChatEditorInput } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { ChatWidget } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+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 { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 
 let ChatEditor = class ChatEditor extends EditorPane {
     get scopedContextKeyService() {
         return this._scopedContextKeyService;
     }
-    constructor(group, telemetryService, themeService, instantiationService, storageService, contextKeyService, chatService) {
+    constructor(group, telemetryService, themeService, instantiationService, storageService, contextKeyService) {
         super(ChatEditorInput.EditorID, group, telemetryService, themeService, storageService);
         this.instantiationService = instantiationService;
         this.storageService = storageService;
         this.contextKeyService = contextKeyService;
-        this.chatService = chatService;
     }
     async clear() {
         if (this.input) {
@@ -51,17 +49,16 @@ let ChatEditor = class ChatEditor extends EditorPane {
             autoScroll: mode => mode !== ChatMode.Ask,
             renderFollowups: true,
             supportsFileReferences: true,
-            supportsAdditionalParticipants: true,
             rendererOptions: {
                 renderTextEditsAsSummary: (uri) => {
-                    return this.chatService.isEditingLocation(ChatAgentLocation.Panel);
+                    return true;
                 },
-                referencesExpandedWhenEmptyResponse: !this.chatService.isEditingLocation(ChatAgentLocation.Panel),
+                referencesExpandedWhenEmptyResponse: false,
                 progressMessageAtBottomOfResponse: mode => mode !== ChatMode.Ask,
             },
             enableImplicitContext: true,
-            enableWorkingSet: this.chatService.isEditingLocation(ChatAgentLocation.Panel) ? 'explicit' : undefined,
-            supportsChangingModes: this.chatService.isEditingLocation(ChatAgentLocation.Panel),
+            enableWorkingSet: 'explicit',
+            supportsChangingModes: true,
         }, {
             listForeground: editorForeground,
             listBackground: editorBackground,
@@ -124,8 +121,7 @@ ChatEditor = ( __decorate([
     ( __param(2, IThemeService)),
     ( __param(3, IInstantiationService)),
     ( __param(4, IStorageService)),
-    ( __param(5, IContextKeyService)),
-    ( __param(6, IChatService))
+    ( __param(5, IContextKeyService))
 ], ChatEditor));
 
 export { ChatEditor };

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

@@ -2,7 +2,6 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 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 { ViewPane } from "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
 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";
@@ -21,6 +20,3 @@ export declare class ChatCompatibilityNotifier extends Disposable implements IWo
     constructor(extensionsWorkbenchService: IExtensionsWorkbenchService, contextKeyService: IContextKeyService, productService: IProductService);
     private registerWelcomeView;
 }
-export declare class MovedChatEditsViewPane extends ViewPane {
-    shouldShowWelcome(): boolean;
-}