@codingame/monaco-vscode-chat-service-override 23.2.2 → 24.1.0

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

@@ -1,15 +1,15 @@
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { URI, UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
 import { INotebookTextModel, NotebookData, TransientOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 type ChatEditingSnapshotNotebookContentQueryData = {
-    sessionId: string;
+    session: UriComponents;
     requestId: string | undefined;
     undoStop: string | undefined;
     viewType: string;
 };
 export declare const ChatEditingNotebookSnapshotScheme = "chat-editing-notebook-snapshot-model";
-export declare function getNotebookSnapshotFileURI(chatSessionId: string, requestId: string | undefined, undoStop: string | undefined, path: string, viewType: string): URI;
+export declare function getNotebookSnapshotFileURI(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined, path: string, viewType: string): URI;
 export declare function parseNotebookSnapshotFileURI(resource: URI): ChatEditingSnapshotNotebookContentQueryData;
 export declare function createSnapshot(notebook: INotebookTextModel, transientOptions: TransientOptions | undefined, outputSizeConfig: IConfigurationService | number): string;
 export declare function restoreSnapshot(notebook: INotebookTextModel, snapshot: string): void;

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

@@ -2,17 +2,17 @@
 import { VSBuffer, encodeBase64, decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { filter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
-import { NotebookCellTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
+import { SnapshotContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { NotebookCellTextModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { NotebookSetting, CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
 const BufferMarker = 'ArrayBuffer-4f56482b-5a03-49ba-8356-210d3b0c1c3d';
 const ChatEditingNotebookSnapshotScheme = 'chat-editing-notebook-snapshot-model';
-function getNotebookSnapshotFileURI(chatSessionId, requestId, undoStop, path, viewType) {
+function getNotebookSnapshotFileURI(chatSessionResource, requestId, undoStop, path, viewType) {
     return ( URI.from({
         scheme: ChatEditingNotebookSnapshotScheme,
         path,
-        query: JSON.stringify({ sessionId: chatSessionId, requestId: requestId ?? '', undoStop: undoStop ?? '', viewType }),
+        query: JSON.stringify({ session: chatSessionResource, requestId: requestId ?? '', undoStop: undoStop ?? '', viewType }),
     }));
 }
 function createSnapshot(notebook, transientOptions, outputSizeConfig) {

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

@@ -8,9 +8,9 @@ import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/l
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 /**
  * This is very closely similar to the ChatEditingModifiedDocumentEntry class.
  * Most of the code has been borrowed from there, as a cell is effectively a document.

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } 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 { CellEditState } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';

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

@@ -2,7 +2,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { INotebookTextDiffEditor } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser";
+import { INotebookTextDiffEditor } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser";
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
 import { IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
 import { ChatEditingModifiedNotebookEntry } from "../chatEditingModifiedNotebookEntry.js";

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.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 { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -15,10 +16,10 @@ import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { NotebookDeletedCellDecorator } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator';
-import { NotebookInsertedCellDecorator } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator';
+import { NotebookDeletedCellDecorator } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator';
+import { NotebookInsertedCellDecorator } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator';
 import { NotebookModifiedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js';
-import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { ChatEditingCodeEditorIntegration } from '../chatEditingCodeEditorIntegration.js';
@@ -282,6 +283,16 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             className: 'chat-diff-change-content-widget',
             telemetrySource: 'chatEditingNotebookHunk',
             menuId: MenuId.ChatEditingEditorHunk,
+            actionViewItemProvider: (action, options) => {
+                if (!action.class) {
+                    return new (class extends ActionViewItem {
+                        constructor() {
+                            super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true , icon: false, label: true });
+                        }
+                    });
+                }
+                return undefined;
+            },
             argFactory: (deletedCellIndex) => {
                 return {
                     accept() {
@@ -547,7 +558,7 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
         const diffInput = {
             original: { resource: this._entry.originalURI },
             modified: { resource: this._entry.modifiedURI },
-            label: ( localize(5205, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+            label: ( localize(5265, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }

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

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { INotebookEditor } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
 import { ICellDiffInfo } from "./notebookCellChanges.js";
 export declare class OverlayToolbarDecorator extends Disposable {

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

@@ -10,9 +10,8 @@ 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-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-api/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) {
@@ -106,10 +105,10 @@ let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {
                     },
                 },
                 actionViewItemProvider: (action, options) => {
-                    if (action.id === AcceptHunkAction.ID || action.id === RejectHunkAction.ID) {
+                    if (!action.class) {
                         return new (class extends ActionViewItem {
                             constructor() {
-                                super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true, icon: false, label: true });
+                                super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true , icon: false, label: true });
                             }
                         });
                     }

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-09f99a3e-bf90-51d4-ab34-acea412359d2-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
+import { EditorGroupView } from '@codingame/monaco-vscode-api/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,12 @@ 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-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-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { cleanupOldImages, createFileForMedia } from '@codingame/monaco-vscode-api/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,7 +31,6 @@ 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';
@@ -41,12 +38,11 @@ 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, _layoutService) {
+    constructor(_editor, _container, _hostService, _chatWidgetService, fileService, environmentService, logService, configurationService, _preferencesService, _browserElementsService, contextMenuService) {
         this._editor = _editor;
         this._container = _container;
         this._hostService = _hostService;
         this._chatWidgetService = _chatWidgetService;
-        this._viewService = _viewService;
         this.fileService = fileService;
         this.environmentService = environmentService;
         this.logService = logService;
@@ -54,7 +50,6 @@ 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;
@@ -75,27 +70,27 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         const mainContent = createElement('div');
         mainContent.className = 'element-selection-main-content';
         const message = createElement('span');
-        const startSelectionMessage = ( localize(5206, 'Add element to chat'));
+        const startSelectionMessage = ( localize(5266, 'Add element to chat'));
         message.textContent = startSelectionMessage;
         mainContent.appendChild(message);
         let cts;
         const actions = [];
         actions.push(toAction({
             id: 'singleSelection',
-            label: ( localize(5207, 'Select an Element')),
+            label: ( localize(5267, 'Select an Element')),
             enabled: true,
             run: async () => { await startElementSelection(); }
         }), toAction({
             id: 'continuousSelection',
-            label: ( localize(5208, 'Continuous Selection')),
+            label: ( localize(5268, 'Continuous Selection')),
             enabled: true,
             run: async () => {
                 this._editor.focus();
                 cts = ( new CancellationTokenSource());
-                message.textContent = ( localize(5209, 'Selecting element...'));
+                message.textContent = ( localize(5269, 'Selecting element...'));
                 this.hideElement(startButton.element);
                 this.showElement(cancelButton.element);
-                cancelButton.label = ( localize(5210, 'Done'));
+                cancelButton.label = ( localize(5270, 'Done'));
                 while (!cts.token.isCancellationRequested) {
                     try {
                         await this.addElementToChat(cts);
@@ -106,7 +101,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
                         break;
                     }
                 }
-                message.textContent = ( localize(5211, 'Element added to chat'));
+                message.textContent = ( localize(5271, 'Element added to chat'));
                 finishedSelecting();
             }
         }));
@@ -115,29 +110,29 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
             addPrimaryActionToDropdown: false,
             contextMenuProvider: this.contextMenuService,
             supportShortLabel: true,
-            title: ( localize(5212, 'Click to select an element.')),
+            title: ( localize(5272, 'Click to select an element.')),
             supportIcons: true,
             ...defaultButtonStyles
         })));
-        startButton.primaryButton.label = ( localize(5213, 'Start'));
+        startButton.primaryButton.label = ( localize(5273, 'Start'));
         startButton.element.classList.add('element-selection-start');
         const cancelButton = this._showStore.add(( new Button(
             mainContent,
-            { ...defaultButtonStyles, supportIcons: true, title: ( localize(5214, 'Click to cancel selection.')) }
+            { ...defaultButtonStyles, supportIcons: true, title: ( localize(5274, 'Click to cancel selection.')) }
         )));
         cancelButton.element.className = 'element-selection-cancel hidden';
-        const cancelButtonLabel = ( localize(5215, 'Cancel'));
+        const cancelButtonLabel = ( localize(5275, 'Cancel'));
         cancelButton.label = cancelButtonLabel;
-        const configure = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(5216, "Configure Attachments Sent")) })));
+        const configure = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(5276, "Configure Attachments Sent")) })));
         configure.icon = Codicon.gear;
-        const collapseOverlay = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(5217, "Collapse Overlay")) })));
+        const collapseOverlay = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(5277, "Collapse Overlay")) })));
         collapseOverlay.icon = Codicon.chevronRight;
-        const nextSelection = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(5218, "Select Again")) })));
+        const nextSelection = this._showStore.add(( new Button(mainContent, { supportIcons: true, title: ( localize(5278, "Select Again")) })));
         nextSelection.icon = Codicon.close;
         nextSelection.element.classList.add('hidden');
         const expandContainer = createElement('div');
         expandContainer.className = 'element-expand-container hidden';
-        const expandOverlay = this._showStore.add(( new Button(expandContainer, { supportIcons: true, title: ( localize(5219, "Expand Overlay")) })));
+        const expandOverlay = this._showStore.add(( new Button(expandContainer, { supportIcons: true, title: ( localize(5279, "Expand Overlay")) })));
         expandOverlay.icon = Codicon.layout;
         this._domNode.appendChild(mainContent);
         this._domNode.appendChild(expandContainer);
@@ -159,11 +154,11 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         const startElementSelection = async () => {
             cts = ( new CancellationTokenSource());
             this._editor.focus();
-            message.textContent = ( localize(5209, 'Selecting element...'));
+            message.textContent = ( localize(5269, 'Selecting element...'));
             this.hideElement(startButton.element);
             this.showElement(cancelButton.element);
             await this.addElementToChat(cts);
-            message.textContent = ( localize(5211, 'Element added to chat'));
+            message.textContent = ( localize(5271, 'Element added to chat'));
             finishedSelecting();
         };
         this._showStore.add(addDisposableListener(startButton.primaryButton.element, 'click', async () => {
@@ -171,7 +166,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         }));
         this._showStore.add(addDisposableListener(cancelButton.element, 'click', () => {
             cts.cancel();
-            message.textContent = ( localize(5220, 'Selection canceled'));
+            message.textContent = ( localize(5280, 'Selection canceled'));
             finishedSelecting();
         }));
         this._showStore.add(addDisposableListener(collapseOverlay.element, 'click', () => {
@@ -215,7 +210,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         }
         const bounds = elementData.bounds;
         const toAttach = [];
-        const widget = (await showChatView(this._viewService, this._layoutService)) ?? this._chatWidgetService.lastFocusedWidget;
+        const widget = (await this._chatWidgetService.revealWidget()) ?? 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;
@@ -270,15 +265,13 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
 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)),
-    ( __param(10, IBrowserElementsService)),
-    ( __param(11, IContextMenuService)),
-    ( __param(12, IWorkbenchLayoutService))
+    ( __param(4, IFileService)),
+    ( __param(5, IEnvironmentService)),
+    ( __param(6, ILogService)),
+    ( __param(7, IConfigurationService)),
+    ( __param(8, IPreferencesService)),
+    ( __param(9, IBrowserElementsService)),
+    ( __param(10, IContextMenuService))
 ], SimpleBrowserOverlayWidget));
 let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
     constructor(container, group, instaService, configurationService, _browserElementsService) {
@@ -308,7 +301,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
         };
         let cts = ( new CancellationTokenSource());
         const show = async () => {
-            connectingWebviewElement.textContent = ( localize(5221, 'Connecting to webview...'));
+            connectingWebviewElement.textContent = ( localize(5281, 'Connecting to webview...'));
             if (!container.contains(connectingWebviewElement)) {
                 container.appendChild(connectingWebviewElement);
             }
@@ -319,7 +312,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
                     await this._browserElementsService.startDebugSession(cts.token, activeBrowserType);
                 }
                 catch (error) {
-                    connectingWebviewElement.textContent = ( localize(5222, 'Please reopen the preview.'));
+                    connectingWebviewElement.textContent = ( localize(5282, 'Please reopen the preview.'));
                     return;
                 }
             }

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

@@ -7,14 +7,21 @@ 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-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-api/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-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatModelInputState, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
-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";
+import { ChatEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
+import { ChatWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
 export interface IChatEditorOptions extends IEditorOptions {
+    /**
+     * Input state of the model when the editor is opened. Currently needed since
+     * new sessions are not persisted but may go away with
+     * https://github.com/microsoft/vscode/pull/278476 as input state is stored on the model.
+     */
+    modelInputState?: IChatModelInputState;
     target?: {
         data: IExportableChatData | ISerializableChatData;
     };
@@ -26,19 +33,17 @@ export interface IChatEditorOptions extends IEditorOptions {
 }
 export declare class ChatEditor extends EditorPane {
     private readonly instantiationService;
-    private readonly storageService;
     private readonly chatSessionsService;
     private readonly contextKeyService;
+    private readonly chatService;
     private _widget;
     get widget(): ChatWidget;
     private _scopedContextKeyService;
     get scopedContextKeyService(): IScopedContextKeyService;
-    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);
+    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, instantiationService: IInstantiationService, storageService: IStorageService, chatSessionsService: IChatSessionsService, contextKeyService: IContextKeyService, chatService: IChatService);
     private clear;
     protected createEditor(parent: HTMLElement): void;
     protected setEditorVisible(visible: boolean): void;
@@ -48,7 +53,5 @@ export declare class ChatEditor extends EditorPane {
     private hideLoadingInChatWidget;
     setInput(input: ChatEditorInput, options: IChatEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
     private updateModel;
-    protected saveState(): void;
-    getViewState(): object | undefined;
     layout(dimension: dom.Dimension, position?: dom.IDomPosition | undefined): void;
 }

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

@@ -9,7 +9,6 @@ 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';
-import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 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 '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
@@ -24,17 +23,16 @@ 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-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/parts/editor/editorPane';
-import { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/common/memento';
+import { EditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorPane';
 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-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 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-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';
+import { clearChatEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 
 let ChatEditor = class ChatEditor extends EditorPane {
     get widget() {
@@ -43,12 +41,12 @@ let ChatEditor = class ChatEditor extends EditorPane {
     get scopedContextKeyService() {
         return this._scopedContextKeyService;
     }
-    constructor(group, telemetryService, themeService, instantiationService, storageService, chatSessionsService, contextKeyService) {
+    constructor(group, telemetryService, themeService, instantiationService, storageService, chatSessionsService, contextKeyService, chatService) {
         super(ChatEditorInput.EditorID, group, telemetryService, themeService, storageService);
         this.instantiationService = instantiationService;
-        this.storageService = storageService;
         this.chatSessionsService = chatSessionsService;
         this.contextKeyService = contextKeyService;
+        this.chatService = chatService;
         this.dimension = new Dimension(0, 0);
     }
     async clear() {
@@ -66,6 +64,7 @@ let ChatEditor = class ChatEditor extends EditorPane {
             autoScroll: mode => mode !== ChatModeKind.Ask,
             renderFollowups: true,
             supportsFileReferences: true,
+            clear: () => this.clear(),
             rendererOptions: {
                 renderTextEditsAsSummary: (uri) => {
                     return true;
@@ -83,7 +82,9 @@ let ChatEditor = class ChatEditor extends EditorPane {
             inputEditorBackground: inputBackground,
             resultEditorBackground: editorBackground
         }));
-        this._register(this.widget.onDidClear(() => this.clear()));
+        this._register(this.widget.onDidSubmitAgent(() => {
+            this.group.pinEditor(this.input);
+        }));
         this.widget.render(parent);
         this.widget.setVisible(true);
     }
@@ -100,6 +101,7 @@ let ChatEditor = class ChatEditor extends EditorPane {
     }
     clearInput() {
         this.saveState();
+        this.widget.setModel(undefined);
         super.clearInput();
     }
     showLoadingInChatWidget(message) {
@@ -139,7 +141,7 @@ let ChatEditor = class ChatEditor extends EditorPane {
         let isContributedChatSession = false;
         const chatSessionType = input.getSessionType();
         if (chatSessionType !== localChatSessionType) {
-            const loadingMessage = ( localize(5223, "Loading..."));
+            const loadingMessage = ( localize(5283, "Loading..."));
             this.showLoadingInChatWidget(loadingMessage);
         }
         await super.setInput(input, options, context, token);
@@ -179,10 +181,12 @@ let ChatEditor = class ChatEditor extends EditorPane {
             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);
+            if (options?.modelInputState) {
+                editorModel.model.inputModel.setState(options.modelInputState);
+            }
+            this.updateModel(editorModel.model);
+            if (isContributedChatSession && options?.title?.preferred && input.sessionResource) {
+                this.chatService.setChatSessionTitle(input.sessionResource, options.title.preferred);
             }
         }
         catch (error) {
@@ -190,22 +194,8 @@ let ChatEditor = class ChatEditor extends EditorPane {
             throw error;
         }
     }
-    updateModel(model, viewState) {
-        this._memento = ( new Memento('interactive-session-editor-' + CHAT_PROVIDER_ID, this.storageService));
-        this._viewState = viewState ?? this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-        this.widget.setModel(model, { ...this._viewState });
-    }
-    saveState() {
-        this.widget?.saveState();
-        if (this._memento && this._viewState) {
-            const widgetViewState = this.widget.getViewState();
-            this._viewState.inputValue = widgetViewState.inputValue;
-            this._viewState.inputState = widgetViewState.inputState;
-            this._memento.saveMemento();
-        }
-    }
-    getViewState() {
-        return { ...this._viewState };
+    updateModel(model) {
+        this.widget.setModel(model);
     }
     layout(dimension, position) {
         this.dimension = dimension;
@@ -220,7 +210,8 @@ ChatEditor = ( __decorate([
     ( __param(3, IInstantiationService)),
     ( __param(4, IStorageService)),
     ( __param(5, IChatSessionsService)),
-    ( __param(6, IContextKeyService))
+    ( __param(6, IContextKeyService)),
+    ( __param(7, IChatService))
 ], ChatEditor));
 
 export { ChatEditor };