@codingame/monaco-vscode-chat-service-override 21.6.0 → 22.0.0

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

@@ -149,6 +149,9 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         this.initializeModelsFromDiff();
         this._register(this.modifiedModel.onDidChangeContent(this.mirrorNotebookEdits, this));
     }
+    hasModificationAt(location) {
+        return this.cellEntryMap.get(location.uri)?.hasModificationAt(location.range) ?? false;
+    }
     initializeModelsFromDiffImpl(cellsDiffInfo) {
         this.cellEntryMap.forEach(entry => entry.dispose());
         this.cellEntryMap.clear();
@@ -397,7 +400,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(5051, "Chat Edit: '{0}'", request.message.text)) : ( localize(5052, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5102, "Chat Edit: '{0}'", request.message.text)) : ( localize(5103, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
@@ -838,7 +841,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             if (this.modifiedModel.cells.indexOf(cell) === -1) {
                 return;
             }
-            const diffs = this.cellsDiffInfo.get().slice();
+            const diffs = this.cellsDiffInfo.read(undefined).slice();
             const index = this.modifiedModel.cells.indexOf(cell);
             let entry = diffs.find(entry => entry.modifiedCellIndex === index);
             if (!entry) {
@@ -846,13 +849,13 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             }
             const entryIndex = diffs.indexOf(entry);
             entry.diff.set(cellEntry.diffInfo.read(r), undefined);
-            if (cellEntry.diffInfo.get().identical && entry.type === 'modified') {
+            if (cellEntry.diffInfo.read(undefined).identical && entry.type === 'modified') {
                 entry = {
                     ...entry,
                     type: 'unchanged',
                 };
             }
-            if (!cellEntry.diffInfo.get().identical && entry.type === 'unchanged') {
+            if (!cellEntry.diffInfo.read(undefined).identical && entry.type === 'unchanged') {
                 entry = {
                     ...entry,
                     type: 'modified',

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

@@ -14,7 +14,7 @@ import { IDecorationsService } from "@codingame/monaco-vscode-api/vscode/vs/work
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
-import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
 import { IMultiDiffSourceResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { IChatEditingSession, IChatRelatedFile, IChatRelatedFilesProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";

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

@@ -28,7 +28,7 @@ import { IDecorationsService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
-import { MultiDiffEditorItem } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
+import { MultiDiffEditorItem } from '@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
 import { IMultiDiffSourceResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service';
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
@@ -98,7 +98,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: 'join.chatEditingSession',
-                label: ( localize(5053, "Saving chat edits history"))
+                label: ( localize(5104, "Saving chat edits history"))
             });
         }));
     }
@@ -326,7 +326,7 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
         super();
         this._sessions = _sessions;
         this._chatAgentService = _chatAgentService;
-        this.label = ( localize(5054, "Chat Editing"));
+        this.label = ( localize(5105, "Chat Editing"));
         this._currentEntries = derived(this, (r) => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -362,11 +362,11 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
         }
         const isModified = ( this._modifiedUris.get().some(e => ( e.toString()) === ( uri.toString())));
         if (isModified) {
-            const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)?.fullName;
+            const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Chat)?.fullName;
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: defaultAgentName ? ( localize(5055, "Pending changes from {0}", defaultAgentName)) : ( localize(5056, "Pending changes from chat")),
+                tooltip: defaultAgentName ? ( localize(5106, "Pending changes from {0}", defaultAgentName)) : ( localize(5107, "Pending changes from chat")),
                 bubble: true
             };
         }

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

@@ -66,6 +66,7 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private _assertNotDisposed;
     accept(...uris: URI[]): Promise<void>;
     reject(...uris: URI[]): Promise<void>;
+    private _operateEntry;
     show(previousChanges?: boolean): Promise<void>;
     private _stopPromise;
     stop(clearState?: boolean): Promise<void>;

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

@@ -21,7 +21,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
 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 { MultiDiffEditorInput } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { ChatEditingSessionState, ModifiedFileEntryState, getMultiDiffSourceUri, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
@@ -88,7 +88,6 @@ function getCurrentAndNextStop(requestId, stopId, history) {
 }
 let ChatEditingSession = class ChatEditingSession extends Disposable {
     get entries() {
-        this._assertNotDisposed();
         return this._entriesObs;
     }
     get state() {
@@ -259,30 +258,24 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         }
     }
     async accept(...uris) {
-        this._assertNotDisposed();
-        if (uris.length === 0) {
-            await Promise.all(( this._entriesObs.get().map(entry => entry.accept())));
-        }
-        for (const uri of uris) {
-            const entry = this._entriesObs.get().find(e => isEqual(e.modifiedURI, uri));
-            if (entry) {
-                await entry.accept();
-            }
+        if (await this._operateEntry('accept', uris)) {
+            this._accessibilitySignalService.playSignal(AccessibilitySignal.editsKept, { allowManyInParallel: true });
         }
-        this._accessibilitySignalService.playSignal(AccessibilitySignal.editsKept, { allowManyInParallel: true });
     }
     async reject(...uris) {
-        this._assertNotDisposed();
-        if (uris.length === 0) {
-            await Promise.all(( this._entriesObs.get().map(entry => entry.reject())));
+        if (await this._operateEntry('reject', uris)) {
+            this._accessibilitySignalService.playSignal(AccessibilitySignal.editsUndone, { allowManyInParallel: true });
         }
-        for (const uri of uris) {
-            const entry = this._entriesObs.get().find(e => isEqual(e.modifiedURI, uri));
-            if (entry) {
-                await entry.reject();
-            }
+    }
+    async _operateEntry(action, uris) {
+        this._assertNotDisposed();
+        const applicableEntries = this._entriesObs.get()
+            .filter(e => uris.length === 0 || ( uris.some(u => isEqual(u, e.modifiedURI))))
+            .filter(e => !e.isCurrentlyBeingModifiedBy.get());
+        for (const entry of applicableEntries) {
+            await entry[action]();
         }
-        this._accessibilitySignalService.playSignal(AccessibilitySignal.editsUndone, { allowManyInParallel: true });
+        return applicableEntries.length;
     }
     async show(previousChanges) {
         this._assertNotDisposed();
@@ -297,7 +290,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(5057, "Suggested Edits"))
+            label: ( localize(5108, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorGroupsService.activeGroup.openEditor(input, { pinned: true, activation: EditorActivation.ACTIVATE });
     }
@@ -427,10 +420,10 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
             get result() { return responseModel.result; }
             get applyCodeBlockSuggestionId() { return responseModel.request?.modeInfo?.applyCodeBlockSuggestionId; }
             get feature() {
-                if (responseModel.session.initialLocation === ChatAgentLocation.Panel) {
+                if (responseModel.session.initialLocation === ChatAgentLocation.Chat) {
                     return 'sideBarChat';
                 }
-                else if (responseModel.session.initialLocation === ChatAgentLocation.Editor) {
+                else if (responseModel.session.initialLocation === ChatAgentLocation.EditorInline) {
                     return 'inlineChat';
                 }
                 return responseModel.session.initialLocation;

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

@@ -1,6 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import { DetailedLineRangeMapping } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping";
 import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ITextModel, ITextSnapshot } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
@@ -79,6 +80,7 @@ export declare class ChatEditingTextModelChangeService extends Disposable {
     private _keepHunk;
     private _undoHunk;
     private _updateDiffInfoSeq;
+    hasHunkAt(range: IRange): boolean;
     private _updateDiffInfo;
 }
 export {};

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

@@ -12,6 +12,7 @@ import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/t
 import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
 import { StringEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/stringEdit';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
 import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
 import { TextEdit, VersionedExtensionId } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
@@ -343,6 +344,9 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             }
         }
     }
+    hasHunkAt(range) {
+        return ( this._diffInfo.get().changes.some(c => c.modified.intersectsStrict(LineRange.fromRangeInclusive(range))));
+    }
     async _updateDiffInfo() {
         if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed() || this._store.isDisposed) {
             return undefined;

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

@@ -1,6 +1,7 @@
 import { Disposable, DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import { IDocumentDiff } from "../../../../../../editor/common/diff/documentDiffProvider.js";
 import { DetailedLineRangeMapping } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping";
 import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
@@ -33,6 +34,7 @@ export declare class ChatEditingNotebookCellEntry extends Disposable {
     private readonly initialContent;
     private readonly _textModelChangeService;
     constructor(notebookUri: URI, cell: NotebookCellTextModel, modifiedModel: ITextModel, originalModel: ITextModel, disposables: DisposableStore, notebookEditorService: INotebookEditorService, instantiationService: IInstantiationService);
+    hasModificationAt(range: IRange): boolean;
     clearCurrentEditLineDecoration(): void;
     acceptAgentEdits(textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
     revertMarkdownPreviewState(): void;

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

@@ -50,6 +50,9 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Di
             }
         }));
     }
+    hasModificationAt(range) {
+        return this._textModelChangeService.hasHunkAt(range);
+    }
     clearCurrentEditLineDecoration() {
         if (this.modifiedModel.isDisposed()) {
             return;

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

@@ -4,8 +4,8 @@ import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
 import { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
 import { PrefixSumComputer } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/prefixSumComputer';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -167,7 +167,7 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             onDidChangeVisibleRanges.read(r);
             if (!changes.length) {
                 this.cellEditorIntegrations.forEach(({ diff }) => {
-                    diff.set({ ...diff.get(), ...nullDocumentDiff }, undefined);
+                    diff.set({ ...diff.read(undefined), ...nullDocumentDiff }, undefined);
                 });
                 return;
             }
@@ -208,7 +208,7 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
                 validCells.add(cell);
                 const currentDiff = this.cellEditorIntegrations.get(cell);
                 if (currentDiff) {
-                    if (!areDocumentDiff2Equal(currentDiff.diff.get(), diff)) {
+                    if (!areDocumentDiff2Equal(currentDiff.diff.read(undefined), diff)) {
                         currentDiff.diff.set(diff, undefined);
                     }
                 }
@@ -547,18 +547,18 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
         }
     }
     async toggleDiff(_change, _show) {
-        const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)?.fullName;
+        const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Chat)?.fullName;
         const diffInput = {
             original: { resource: this._entry.originalURI },
             modified: { resource: this._entry.modifiedURI },
             label: defaultAgentName
                 ? ( localize(
-                5058,
+                5109,
                 '{0} (changes from {1})',
                 basename(this._entry.modifiedURI),
                 defaultAgentName
             ))
-                : ( localize(5059, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                : ( localize(5110, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }

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

@@ -24,7 +24,7 @@ import { ButtonWithDropdown, Button } from '@codingame/monaco-vscode-api/vscode/
 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-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { cleanupOldImages, createFileForMedia } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-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';
@@ -71,27 +71,27 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         this._domNode = createElement('div');
         this._domNode.className = 'element-selection-message';
         const message = createElement('span');
-        const startSelectionMessage = ( localize(5060, 'Add element to chat'));
+        const startSelectionMessage = ( localize(5111, 'Add element to chat'));
         message.textContent = startSelectionMessage;
         this._domNode.appendChild(message);
         let cts;
         const actions = [];
         actions.push(toAction({
             id: 'singleSelection',
-            label: ( localize(5061, 'Select an Element')),
+            label: ( localize(5112, 'Select an Element')),
             enabled: true,
             run: async () => { await startElementSelection(); }
         }), toAction({
             id: 'continuousSelection',
-            label: ( localize(5062, 'Continuous Selection')),
+            label: ( localize(5113, 'Continuous Selection')),
             enabled: true,
             run: async () => {
                 this._editor.focus();
                 cts = ( new CancellationTokenSource());
-                message.textContent = ( localize(5063, 'Selecting element...'));
+                message.textContent = ( localize(5114, 'Selecting element...'));
                 this.hideElement(startButton.element);
                 this.showElement(cancelButton.element);
-                cancelButton.label = ( localize(5064, 'Done'));
+                cancelButton.label = ( localize(5115, 'Done'));
                 while (!cts.token.isCancellationRequested) {
                     try {
                         await this.addElementToChat(cts);
@@ -102,7 +102,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
                         break;
                     }
                 }
-                message.textContent = ( localize(5065, 'Element added to chat'));
+                message.textContent = ( localize(5116, 'Element added to chat'));
                 finishedSelecting();
             }
         }));
@@ -111,27 +111,27 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
             addPrimaryActionToDropdown: false,
             contextMenuProvider: this.contextMenuService,
             supportShortLabel: true,
-            title: ( localize(5066, 'Click to select an element.')),
+            title: ( localize(5117, 'Click to select an element.')),
             supportIcons: true,
             ...defaultButtonStyles
         })));
-        startButton.primaryButton.label = ( localize(5067, 'Start'));
+        startButton.primaryButton.label = ( localize(5118, 'Start'));
         startButton.element.classList.add('element-selection-start');
         const cancelButton = this._showStore.add(( new Button(
             this._domNode,
-            { ...defaultButtonStyles, supportIcons: true, title: ( localize(5068, 'Click to cancel selection.')) }
+            { ...defaultButtonStyles, supportIcons: true, title: ( localize(5119, 'Click to cancel selection.')) }
         )));
         cancelButton.element.className = 'element-selection-cancel hidden';
-        const cancelButtonLabel = ( localize(5069, 'Cancel'));
+        const cancelButtonLabel = ( localize(5120, 'Cancel'));
         cancelButton.label = cancelButtonLabel;
-        const configure = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(5070, "Configure Attachments Sent")) })));
+        const configure = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(5121, "Configure Attachments Sent")) })));
         configure.icon = Codicon.gear;
-        const collapseOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(5071, "Collapse Overlay")) })));
+        const collapseOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(5122, "Collapse Overlay")) })));
         collapseOverlay.icon = Codicon.chevronRight;
-        const nextSelection = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(5072, "Select Again")) })));
+        const nextSelection = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(5123, "Select Again")) })));
         nextSelection.icon = Codicon.close;
         nextSelection.element.classList.add('hidden');
-        const expandOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(5073, "Expand Overlay")) })));
+        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';
@@ -155,11 +155,11 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         const startElementSelection = async () => {
             cts = ( new CancellationTokenSource());
             this._editor.focus();
-            message.textContent = ( localize(5063, 'Selecting element...'));
+            message.textContent = ( localize(5114, 'Selecting element...'));
             this.hideElement(startButton.element);
             this.showElement(cancelButton.element);
             await this.addElementToChat(cts);
-            message.textContent = ( localize(5065, 'Element added to chat'));
+            message.textContent = ( localize(5116, 'Element added to chat'));
             finishedSelecting();
         };
         this._showStore.add(addDisposableListener(startButton.primaryButton.element, 'click', async () => {
@@ -167,7 +167,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         }));
         this._showStore.add(addDisposableListener(cancelButton.element, 'click', () => {
             cts.cancel();
-            message.textContent = ( localize(5074, 'Selection canceled'));
+            message.textContent = ( localize(5125, 'Selection canceled'));
             finishedSelecting();
         }));
         this._showStore.add(addDisposableListener(collapseOverlay.element, 'click', () => {
@@ -303,7 +303,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
         };
         let cts = ( new CancellationTokenSource());
         const show = async () => {
-            connectingWebviewElement.textContent = ( localize(5075, 'Connecting to webview...'));
+            connectingWebviewElement.textContent = ( localize(5126, 'Connecting to webview...'));
             if (!container.contains(connectingWebviewElement)) {
                 container.appendChild(connectingWebviewElement);
             }
@@ -314,7 +314,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
                     await this._browserElementsService.startDebugSession(cts.token, activeBrowserType);
                 }
                 catch (error) {
-                    connectingWebviewElement.textContent = ( localize(5076, 'Please reopen the preview.'));
+                    connectingWebviewElement.textContent = ( localize(5127, 'Please reopen the preview.'));
                     return;
                 }
             }

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

@@ -7,7 +7,7 @@ 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-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+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";

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

@@ -20,8 +20,8 @@ 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-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/browser/parts/editor/editorPane';
-import { Memento } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/workbench/common/memento';
+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 { 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';
@@ -29,7 +29,7 @@ import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/wor
 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 '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common';
+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';
 
 let ChatEditor = class ChatEditor extends EditorPane {
@@ -56,7 +56,7 @@ let ChatEditor = class ChatEditor extends EditorPane {
         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);
-        this._widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Panel, undefined, {
+        this._widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Chat, undefined, {
             autoScroll: mode => mode !== ChatModeKind.Ask,
             renderFollowups: true,
             supportsFileReferences: true,

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

@@ -1,12 +1,10 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { ChatFontSize } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatLayoutService";
 import { IChatLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatLayoutService.service";
 export declare class ChatLayoutService extends Disposable implements IChatLayoutService {
     readonly _serviceBrand: undefined;
-    private readonly _fontSizeDefault;
     readonly fontFamily: IObservable<string | null>;
-    readonly fontSize: IObservable<ChatFontSize>;
+    readonly fontSize: IObservable<number>;
     constructor(configurationService: IConfigurationService);
 }

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

@@ -6,27 +6,16 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
+const FONT_SIZE = 13;
 let ChatLayoutService = class ChatLayoutService extends Disposable {
     constructor(configurationService) {
         super();
-        this._fontSizeDefault = 13;
         const chatFontFamily = observableConfigValue('chat.fontFamily', 'default', configurationService);
-        const chatFontSize = observableConfigValue('chat.fontSize', this._fontSizeDefault, configurationService);
         this.fontFamily = derived(reader => {
             const fontFamily = chatFontFamily.read(reader);
             return fontFamily === 'default' ? null : fontFamily;
         });
-        this.fontSize = derived(reader => {
-            const fontSize = chatFontSize.read(reader);
-            return {
-                xs: Math.round(fontSize * (11 / this._fontSizeDefault)),
-                s: Math.round(fontSize * (12 / this._fontSizeDefault)),
-                m: Math.round(fontSize * (13 / this._fontSizeDefault)),
-                l: Math.round(fontSize * (14 / this._fontSizeDefault)),
-                xl: Math.round(fontSize * (16 / this._fontSizeDefault)),
-                xxl: Math.round(fontSize * (20 / this._fontSizeDefault)),
-            };
-        });
+        this.fontSize = observableConfigValue('chat.fontSize', FONT_SIZE, configurationService);
     }
 };
 ChatLayoutService = ( __decorate([

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

@@ -113,13 +113,13 @@ ChatOutputRendererService = ( __decorate([
 ], ChatOutputRendererService));
 const chatOutputRenderContributionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatOutputRenderers',
-    activationEventsGenerator: (contributions, result) => {
+    activationEventsGenerator: function* (contributions) {
         for (const contrib of contributions) {
-            result.push(`onChatOutputRenderer:${contrib.viewType}`);
+            yield `onChatOutputRenderer:${contrib.viewType}`;
         }
     },
     jsonSchema: {
-        description: ( localize(5129, 'Contributes a renderer for specific MIME types in chat outputs')),
+        description: ( localize(5180, 'Contributes a renderer for specific MIME types in chat outputs')),
         type: 'array',
         items: {
             type: 'object',
@@ -128,11 +128,11 @@ const chatOutputRenderContributionPoint = ExtensionsRegistry.registerExtensionPo
             properties: {
                 viewType: {
                     type: 'string',
-                    description: ( localize(5130, 'Unique identifier for the renderer.')),
+                    description: ( localize(5181, 'Unique identifier for the renderer.')),
                 },
                 mimeTypes: {
                     type: 'array',
-                    description: ( localize(5131, 'MIME types that this renderer can handle')),
+                    description: ( localize(5182, 'MIME types that this renderer can handle')),
                     items: {
                         type: 'string'
                     }