@codingame/monaco-vscode-chat-service-override 22.1.9 → 23.0.0

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

@@ -1,5 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 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';
@@ -9,8 +10,9 @@ import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/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-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { AcceptHunkAction, RejectHunkAction } from '../chatEditingEditorActions.js';
 
 let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {
     constructor(notebookEditor, notebookModel, instantiationService, accessibilitySignalService) {
@@ -103,6 +105,16 @@ let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {
                         }
                     },
                 },
+                actionViewItemProvider: (action, options) => {
+                    if (action.id === AcceptHunkAction.ID || action.id === RejectHunkAction.ID) {
+                        return new (class extends ActionViewItem {
+                            constructor() {
+                                super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true, icon: false, label: true });
+                            }
+                        });
+                    }
+                    return undefined;
+                }
             });
             this.overlayDisposables.add(toolbarWidget);
         }

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

@@ -9,7 +9,7 @@ import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/th
 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-615ce609-8555-545a-a549-47bd9f80e9f8-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
+import { EditorGroupView } from '@codingame/monaco-vscode-09f99a3e-bf90-51d4-ab34-acea412359d2-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';
@@ -17,14 +17,14 @@ 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-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-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 { 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 { createElement, 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-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { cleanupOldImages, createFileForMedia } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-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';
@@ -33,6 +33,7 @@ import { IBrowserElementsService } from '@codingame/monaco-vscode-api/vscode/vs/
 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 { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 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';
@@ -40,7 +41,7 @@ import { derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 
 registerCss(simpleBrowserOverlay);
 let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
-    constructor(_editor, _container, _hostService, _chatWidgetService, _viewService, fileService, environmentService, logService, configurationService, _preferencesService, _browserElementsService, contextMenuService) {
+    constructor(_editor, _container, _hostService, _chatWidgetService, _viewService, fileService, environmentService, logService, configurationService, _preferencesService, _browserElementsService, contextMenuService, _layoutService) {
         this._editor = _editor;
         this._container = _container;
         this._hostService = _hostService;
@@ -53,6 +54,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         this._preferencesService = _preferencesService;
         this._browserElementsService = _browserElementsService;
         this.contextMenuService = contextMenuService;
+        this._layoutService = _layoutService;
         this._showStore = ( new DisposableStore());
         this._timeout = undefined;
         this._activeBrowserType = undefined;
@@ -70,28 +72,30 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         cleanupOldImages(this.fileService, this.logService, this.imagesFolder);
         this._domNode = createElement('div');
         this._domNode.className = 'element-selection-message';
+        const mainContent = createElement('div');
+        mainContent.className = 'element-selection-main-content';
         const message = createElement('span');
-        const startSelectionMessage = ( localize(5111, 'Add element to chat'));
+        const startSelectionMessage = ( localize(5186, 'Add element to chat'));
         message.textContent = startSelectionMessage;
-        this._domNode.appendChild(message);
+        mainContent.appendChild(message);
         let cts;
         const actions = [];
         actions.push(toAction({
             id: 'singleSelection',
-            label: ( localize(5112, 'Select an Element')),
+            label: ( localize(5187, 'Select an Element')),
             enabled: true,
             run: async () => { await startElementSelection(); }
         }), toAction({
             id: 'continuousSelection',
-            label: ( localize(5113, 'Continuous Selection')),
+            label: ( localize(5188, 'Continuous Selection')),
             enabled: true,
             run: async () => {
                 this._editor.focus();
                 cts = ( new CancellationTokenSource());
-                message.textContent = ( localize(5114, 'Selecting element...'));
+                message.textContent = ( localize(5189, 'Selecting element...'));
                 this.hideElement(startButton.element);
                 this.showElement(cancelButton.element);
-                cancelButton.label = ( localize(5115, 'Done'));
+                cancelButton.label = ( localize(5190, 'Done'));
                 while (!cts.token.isCancellationRequested) {
                     try {
                         await this.addElementToChat(cts);
@@ -102,41 +106,41 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
                         break;
                     }
                 }
-                message.textContent = ( localize(5116, 'Element added to chat'));
+                message.textContent = ( localize(5191, 'Element added to chat'));
                 finishedSelecting();
             }
         }));
-        const startButton = this._showStore.add(( new ButtonWithDropdown(this._domNode, {
+        const startButton = this._showStore.add(( new ButtonWithDropdown(mainContent, {
             actions: actions,
             addPrimaryActionToDropdown: false,
             contextMenuProvider: this.contextMenuService,
             supportShortLabel: true,
-            title: ( localize(5117, 'Click to select an element.')),
+            title: ( localize(5192, 'Click to select an element.')),
             supportIcons: true,
             ...defaultButtonStyles
         })));
-        startButton.primaryButton.label = ( localize(5118, 'Start'));
+        startButton.primaryButton.label = ( localize(5193, 'Start'));
         startButton.element.classList.add('element-selection-start');
         const cancelButton = this._showStore.add(( new Button(
-            this._domNode,
-            { ...defaultButtonStyles, supportIcons: true, title: ( localize(5119, 'Click to cancel selection.')) }
+            mainContent,
+            { ...defaultButtonStyles, supportIcons: true, title: ( localize(5194, 'Click to cancel selection.')) }
         )));
         cancelButton.element.className = 'element-selection-cancel hidden';
-        const cancelButtonLabel = ( localize(5120, 'Cancel'));
+        const cancelButtonLabel = ( localize(5195, 'Cancel'));
         cancelButton.label = cancelButtonLabel;
-        const configure = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(5121, "Configure Attachments Sent")) })));
+        const configure = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(5196, "Configure Attachments Sent")) })));
         configure.icon = Codicon.gear;
-        const collapseOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(5122, "Collapse Overlay")) })));
+        const collapseOverlay = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(5197, "Collapse Overlay")) })));
         collapseOverlay.icon = Codicon.chevronRight;
-        const nextSelection = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(5123, "Select Again")) })));
+        const nextSelection = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(5198, "Select Again")) })));
         nextSelection.icon = Codicon.close;
         nextSelection.element.classList.add('hidden');
-        const expandOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(5124, "Expand Overlay")) })));
-        expandOverlay.icon = Codicon.layout;
         const expandContainer = createElement('div');
         expandContainer.className = 'element-expand-container hidden';
-        expandContainer.appendChild(expandOverlay.element);
-        this._container.appendChild(expandContainer);
+        const expandOverlay = this._showStore.add(( new Button(expandContainer, { supportIcons: true, title: ( localize(5199, "Expand Overlay")) })));
+        expandOverlay.icon = Codicon.layout;
+        this._domNode.appendChild(mainContent);
+        this._domNode.appendChild(expandContainer);
         const resetButtons = () => {
             this.hideElement(nextSelection.element);
             this.showElement(startButton.element);
@@ -155,11 +159,11 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         const startElementSelection = async () => {
             cts = ( new CancellationTokenSource());
             this._editor.focus();
-            message.textContent = ( localize(5114, 'Selecting element...'));
+            message.textContent = ( localize(5189, 'Selecting element...'));
             this.hideElement(startButton.element);
             this.showElement(cancelButton.element);
             await this.addElementToChat(cts);
-            message.textContent = ( localize(5116, 'Element added to chat'));
+            message.textContent = ( localize(5191, 'Element added to chat'));
             finishedSelecting();
         };
         this._showStore.add(addDisposableListener(startButton.primaryButton.element, 'click', async () => {
@@ -167,15 +171,15 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         }));
         this._showStore.add(addDisposableListener(cancelButton.element, 'click', () => {
             cts.cancel();
-            message.textContent = ( localize(5125, 'Selection canceled'));
+            message.textContent = ( localize(5200, 'Selection canceled'));
             finishedSelecting();
         }));
         this._showStore.add(addDisposableListener(collapseOverlay.element, 'click', () => {
-            this.hideElement(this._domNode);
+            this.hideElement(mainContent);
             this.showElement(expandContainer);
         }));
         this._showStore.add(addDisposableListener(expandOverlay.element, 'click', () => {
-            this.showElement(this._domNode);
+            this.showElement(mainContent);
             this.hideElement(expandContainer);
         }));
         this._showStore.add(addDisposableListener(nextSelection.element, 'click', () => {
@@ -211,7 +215,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         }
         const bounds = elementData.bounds;
         const toAttach = [];
-        const widget = (await showChatView(this._viewService)) ?? this._chatWidgetService.lastFocusedWidget;
+        const widget = (await showChatView(this._viewService, this._layoutService)) ?? 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;
@@ -273,7 +277,8 @@ SimpleBrowserOverlayWidget = ( __decorate([
     ( __param(8, IConfigurationService)),
     ( __param(9, IPreferencesService)),
     ( __param(10, IBrowserElementsService)),
-    ( __param(11, IContextMenuService))
+    ( __param(11, IContextMenuService)),
+    ( __param(12, IWorkbenchLayoutService))
 ], SimpleBrowserOverlayWidget));
 let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
     constructor(container, group, instaService, configurationService, _browserElementsService) {
@@ -303,7 +308,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
         };
         let cts = ( new CancellationTokenSource());
         const show = async () => {
-            connectingWebviewElement.textContent = ( localize(5126, 'Connecting to webview...'));
+            connectingWebviewElement.textContent = ( localize(5201, 'Connecting to webview...'));
             if (!container.contains(connectingWebviewElement)) {
                 container.appendChild(connectingWebviewElement);
             }
@@ -314,7 +319,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
                     await this._browserElementsService.startDebugSession(cts.token, activeBrowserType);
                 }
                 catch (error) {
-                    connectingWebviewElement.textContent = ( localize(5127, 'Please reopen the preview.'));
+                    connectingWebviewElement.textContent = ( localize(5202, 'Please reopen the preview.'));
                     return;
                 }
             }

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

@@ -10,17 +10,18 @@ import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { EditorPane } from "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-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-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
-import { ChatEditorInput } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
-import { ChatWidget } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
+import { ChatEditorInput } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
+import { ChatWidget } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
 export interface IChatEditorOptions extends IEditorOptions {
     target?: {
-        sessionId: string;
-    } | {
         data: IExportableChatData | ISerializableChatData;
     };
-    preferredTitle?: string;
+    title?: {
+        preferred?: string;
+        fallback?: string;
+    };
     ignoreInView?: boolean;
 }
 export declare class ChatEditor extends EditorPane {
@@ -35,12 +36,16 @@ export declare class ChatEditor extends EditorPane {
     private _memento;
     private _viewState;
     private dimension;
+    private _loadingContainer;
+    private _editorContainer;
     constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, instantiationService: IInstantiationService, storageService: IStorageService, chatSessionsService: IChatSessionsService, contextKeyService: IContextKeyService);
     private clear;
     protected createEditor(parent: HTMLElement): void;
     protected setEditorVisible(visible: boolean): void;
     focus(): void;
     clearInput(): void;
+    private showLoadingInChatWidget;
+    private hideLoadingInChatWidget;
     setInput(input: ChatEditorInput, options: IChatEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
     private updateModel;
     protected saveState(): void;

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

@@ -1,7 +1,11 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Dimension } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Dimension, append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { renderIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { raceCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 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';
@@ -24,13 +28,13 @@ import { EditorPane } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b0
 import { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/common/memento';
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { clearChatEditor } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
-import { ChatEditorInput } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { getChatSessionType } from './chatSessions/common.js';
-import { ChatWidget } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { clearChatEditor } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
+import { ChatEditorInput } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatWidget } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 
 let ChatEditor = class ChatEditor extends EditorPane {
     get widget() {
@@ -53,6 +57,8 @@ let ChatEditor = class ChatEditor extends EditorPane {
         }
     }
     createEditor(parent) {
+        this._editorContainer = parent;
+        parent.classList.add('chat-editor-relative');
         this._scopedContextKeyService = this._register(this.contextKeyService.createScoped(parent));
         const scopedInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))));
         ChatContextKeys.inChatEditor.bindTo(this._scopedContextKeyService).set(true);
@@ -96,39 +102,92 @@ let ChatEditor = class ChatEditor extends EditorPane {
         this.saveState();
         super.clearInput();
     }
+    showLoadingInChatWidget(message) {
+        if (!this._editorContainer) {
+            return;
+        }
+        if (this._loadingContainer) {
+            const existingText = this._loadingContainer.querySelector('.chat-loading-content span');
+            if (existingText) {
+                existingText.textContent = message;
+                return;
+            }
+            this.hideLoadingInChatWidget();
+        }
+        this._editorContainer.setAttribute('aria-busy', 'true');
+        this._loadingContainer = append(this._editorContainer, $('.chat-loading-overlay'));
+        this._loadingContainer.setAttribute('role', 'status');
+        this._loadingContainer.setAttribute('aria-live', 'polite');
+        this._loadingContainer.tabIndex = -1;
+        const loadingContent = append(this._loadingContainer, $('.chat-loading-content'));
+        const spinner = renderIcon(ThemeIcon.modify(Codicon.loading, 'spin'));
+        spinner.setAttribute('aria-hidden', 'true');
+        loadingContent.appendChild(spinner);
+        const text = append(loadingContent, $('span'));
+        text.textContent = message;
+    }
+    hideLoadingInChatWidget() {
+        if (this._loadingContainer) {
+            this._loadingContainer.remove();
+            this._loadingContainer = undefined;
+        }
+        if (this._editorContainer) {
+            this._editorContainer.removeAttribute('aria-busy');
+        }
+    }
     async setInput(input, options, context, token) {
+        let isContributedChatSession = false;
+        const chatSessionType = input.getSessionType();
+        if (chatSessionType !== localChatSessionType) {
+            const loadingMessage = ( localize(5203, "Loading..."));
+            this.showLoadingInChatWidget(loadingMessage);
+        }
         await super.setInput(input, options, context, token);
         if (token.isCancellationRequested) {
+            this.hideLoadingInChatWidget();
             return;
         }
         if (!this.widget) {
             throw ( new Error('ChatEditor lifecycle issue: no editor widget'));
         }
-        let isContributedChatSession = false;
-        const chatSessionType = getChatSessionType(input);
-        if (chatSessionType !== 'local') {
-            await raceCancellationError(this.chatSessionsService.canResolveContentProvider(chatSessionType), token);
-            const contributions = this.chatSessionsService.getAllChatSessionContributions();
-            const contribution = contributions.find(c => c.type === chatSessionType);
-            if (contribution) {
-                this.widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
-                isContributedChatSession = true;
+        if (chatSessionType !== localChatSessionType) {
+            try {
+                await raceCancellationError(this.chatSessionsService.canResolveChatSession(input.resource), token);
+                const contributions = this.chatSessionsService.getAllChatSessionContributions();
+                const contribution = contributions.find(c => c.type === chatSessionType);
+                if (contribution) {
+                    this.widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
+                    isContributedChatSession = true;
+                }
+                else {
+                    this.widget.unlockFromCodingAgent();
+                }
             }
-            else {
-                this.widget.unlockFromCodingAgent();
+            catch (error) {
+                this.hideLoadingInChatWidget();
+                throw error;
             }
         }
         else {
             this.widget.unlockFromCodingAgent();
         }
-        const editorModel = await raceCancellationError(input.resolve(), token);
-        if (!editorModel) {
-            throw ( new Error(`Failed to get model for chat editor. id: ${input.sessionId}`));
+        try {
+            const editorModel = await raceCancellationError(input.resolve(), token);
+            if (!editorModel) {
+                throw ( new Error(`Failed to get model for chat editor. resource: ${input.sessionResource}`));
+            }
+            if (chatSessionType !== localChatSessionType) {
+                this.hideLoadingInChatWidget();
+            }
+            const viewState = options?.viewState ?? input.options.viewState;
+            this.updateModel(editorModel.model, viewState);
+            if (isContributedChatSession && options?.title?.preferred) {
+                editorModel.model.setCustomTitle(options.title.preferred);
+            }
         }
-        const viewState = options?.viewState ?? input.options.viewState;
-        this.updateModel(editorModel.model, viewState);
-        if (isContributedChatSession && options?.preferredTitle) {
-            editorModel.model.setCustomTitle(options?.preferredTitle);
+        catch (error) {
+            this.hideLoadingInChatWidget();
+            throw error;
         }
     }
     updateModel(model, viewState) {

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

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.js

@@ -0,0 +1,91 @@
+
+import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { ProductQualityContext } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
+import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
+import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/editor';
+import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { MANAGE_CHAT_COMMAND_ID, CONTEXT_MODELS_SEARCH_FOCUS, CONTEXT_MODELS_EDITOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ChatManagementEditor, ModelsManagementEditor } from './chatManagementEditor.js';
+import { ChatManagementEditorInput, ModelsManagementEditorInput } from './chatManagementEditorInput.js';
+
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatManagementEditor, ChatManagementEditor.ID, ( localize(5257, "Chat Management Editor"))), [
+    ( new SyncDescriptor(ChatManagementEditorInput))
+]);
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(5258, "Models Management Editor"))), [
+    ( new SyncDescriptor(ModelsManagementEditorInput))
+]);
+class ChatManagementEditorInputSerializer {
+    canSerialize(editorInput) {
+        return true;
+    }
+    serialize(input) {
+        return '';
+    }
+    deserialize(instantiationService) {
+        return instantiationService.createInstance(ChatManagementEditorInput);
+    }
+}
+class ModelsManagementEditorInputSerializer {
+    canSerialize(editorInput) {
+        return true;
+    }
+    serialize(input) {
+        return '';
+    }
+    deserialize(instantiationService) {
+        return instantiationService.createInstance(ModelsManagementEditorInput);
+    }
+}
+( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ChatManagementEditorInput.ID, ChatManagementEditorInputSerializer);
+( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ModelsManagementEditorInput.ID, ModelsManagementEditorInputSerializer);
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: MANAGE_CHAT_COMMAND_ID,
+            title: ( localize2(5259, "Manage Language Models")),
+            category: CHAT_CATEGORY,
+            precondition: ( ContextKeyExpr.and(( ProductQualityContext.notEqualsTo('stable')), ChatContextKeys.enabled, ( ContextKeyExpr.or(
+                ChatContextKeys.Entitlement.planFree,
+                ChatContextKeys.Entitlement.planPro,
+                ChatContextKeys.Entitlement.planProPlus,
+                ChatContextKeys.Entitlement.internal
+            )))),
+            f1: true,
+        });
+    }
+    async run(accessor, args) {
+        const editorGroupsService = accessor.get(IEditorGroupsService);
+        return editorGroupsService.activeGroup.openEditor(( new ModelsManagementEditorInput()));
+    }
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'chat.models.action.clearSearchResults',
+            precondition: CONTEXT_MODELS_EDITOR,
+            keybinding: {
+                primary: KeyCode.Escape,
+                weight: KeybindingWeight.EditorContrib,
+                when: CONTEXT_MODELS_SEARCH_FOCUS
+            },
+            title: ( localize2(5260, "Clear Models Search Results"))
+        });
+    }
+    run(accessor) {
+        const activeEditorPane = accessor.get(IEditorService).activeEditorPane;
+        if (activeEditorPane instanceof ModelsManagementEditor) {
+            activeEditorPane.clearSearch();
+        }
+        return null;
+    }
+});

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

@@ -0,0 +1,64 @@
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+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 { IEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor";
+import { EditorPane } from "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-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 { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { ChatManagementEditorInput, ModelsManagementEditorInput } from "./chatManagementEditorInput.js";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
+import { Dimension } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+export declare class ModelsManagementEditor extends EditorPane {
+    private readonly instantiationService;
+    static readonly ID: string;
+    private readonly editorDisposables;
+    private dimension;
+    private modelsWidget;
+    private bodyContainer;
+    private readonly inModelsEditorContextKey;
+    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, instantiationService: IInstantiationService, contextKeyService: IContextKeyService);
+    protected createEditor(parent: HTMLElement): void;
+    setInput(input: ModelsManagementEditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
+    layout(dimension: Dimension): void;
+    focus(): void;
+    clearInput(): void;
+    clearSearch(): void;
+}
+export declare const chatManagementSashBorder: string;
+export declare class ChatManagementEditor extends EditorPane {
+    private readonly instantiationService;
+    static readonly ID: string;
+    private container;
+    private splitView;
+    private sectionsList;
+    private headerContainer;
+    private contentsContainer;
+    private planBadge;
+    private actionButton;
+    private chatUsageWidget;
+    private modelsWidget;
+    private dimension;
+    private selectedSection;
+    private sections;
+    private readonly commandService;
+    private readonly chatEntitlementService;
+    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, instantiationService: IInstantiationService, commandService: ICommandService, chatEntitlementService: IChatEntitlementService);
+    protected createEditor(parent: HTMLElement): void;
+    updateStyles(): void;
+    private renderSidebar;
+    private renderHeader;
+    private renderContents;
+    private renderSelectedSection;
+    private layoutContents;
+    selectSection(sectionId: string): void;
+    private updateHeaderData;
+    private getCurrentPlanName;
+    private shouldShowUpgradeButton;
+    setInput(input: ChatManagementEditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
+    layout(dimension: Dimension): void;
+    focus(): void;
+}