@codingame/monaco-vscode-chat-service-override 18.4.0 → 19.0.0

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

@@ -1,187 +1,73 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { ObservableDisposable } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/base/common/observableDisposable';
-import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-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 { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
-import { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
-import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
-import { ModelDecorationOptions } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
-import { offsetEditFromContentChanges, offsetEditToEditOperations, offsetEditFromLineRangeMapping } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModelStringEdit';
-import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
-import { editorSelectionBackground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
-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 { CellEditState } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { CellEditState } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/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';
-import { pendingRewriteMinimap } from '../chatEditingModifiedFileEntry.js';
+import { ChatEditingTextModelChangeService } from '../chatEditingTextModelChangeService.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
-var ChatEditingNotebookCellEntry_1;
-let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends ObservableDisposable {
-    static { ChatEditingNotebookCellEntry_1 = this; }
-    static { this._lastEditDecorationOptions = ModelDecorationOptions.register({
-        isWholeLine: true,
-        description: 'chat-last-edit',
-        className: 'chat-editing-last-edit-line',
-        marginClassName: 'chat-editing-last-edit',
-        overviewRuler: {
-            position: OverviewRulerLane.Full,
-            color: themeColorFromId(editorSelectionBackground)
-        },
-    }); }
-    static { this._pendingEditDecorationOptions = ModelDecorationOptions.register({
-        isWholeLine: true,
-        description: 'chat-pending-edit',
-        className: 'chat-editing-pending-edit',
-        minimap: {
-            position: MinimapPosition.Inline,
-            color: themeColorFromId(pendingRewriteMinimap)
-        }
-    }); }
+let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Disposable {
+    get isDisposed() {
+        return this._store.isDisposed;
+    }
     get isEditFromUs() {
-        return this._isEditFromUs;
+        return this._textModelChangeService.isEditFromUs;
     }
     get allEditsAreFromUs() {
-        return this._allEditsAreFromUs;
+        return this._textModelChangeService.allEditsAreFromUs;
     }
     get diffInfo() {
-        return this._diffInfo;
+        return this._textModelChangeService.diffInfo;
     }
-    constructor(notebookUri, cell, modifiedModel, originalModel, disposables, configService, _editorWorkerService, notebookEditorService) {
+    constructor(notebookUri, cell, modifiedModel, originalModel, disposables, notebookEditorService, instantiationService) {
         super();
         this.notebookUri = notebookUri;
         this.cell = cell;
         this.modifiedModel = modifiedModel;
         this.originalModel = originalModel;
-        this._editorWorkerService = _editorWorkerService;
         this.notebookEditorService = notebookEditorService;
-        this._edit = StringEdit.empty;
-        this._isEditFromUs = false;
-        this._allEditsAreFromUs = true;
-        this._diffOperationIds = 0;
-        this._diffInfo = observableValue(this, nullDocumentDiff);
+        this.instantiationService = instantiationService;
         this._maxModifiedLineNumber = observableValue(this, 0);
         this.maxModifiedLineNumber = this._maxModifiedLineNumber;
-        this._editDecorationClear = this._register(( new RunOnceScheduler(
-            () => { this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []); },
-            500
-        )));
-        this._editDecorations = [];
         this._stateObs = observableValue(this, ModifiedFileEntryState.Modified);
         this.state = this._stateObs;
-        this._isCurrentlyBeingModifiedByObs = observableValue(this, undefined);
-        this.isCurrentlyBeingModifiedBy = this._isCurrentlyBeingModifiedByObs;
         this.initialContent = this.originalModel.getValue();
         this._register(disposables);
-        this._register(this.modifiedModel.onDidChangeContent(e => {
-            this._mirrorEdits(e);
-        }));
-        this._register(toDisposable(() => {
-            this.clearCurrentEditLineDecoration();
+        this._textModelChangeService = this._register(this.instantiationService.createInstance(ChatEditingTextModelChangeService, this.originalModel, this.modifiedModel, this.state));
+        this._register(this._textModelChangeService.onDidAcceptOrRejectAllHunks(action => {
+            this.revertMarkdownPreviewState();
+            this._stateObs.set(action, undefined);
         }));
-        this._diffTrimWhitespace = observableConfigValue('diffEditor.ignoreTrimWhitespace', true, configService);
-        this._register(autorun(r => {
-            this._diffTrimWhitespace.read(r);
-            this._updateDiffInfoSeq();
+        this._register(this._textModelChangeService.onDidUserEditModel(() => {
+            const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
+            if (this._stateObs.get() === ModifiedFileEntryState.Modified && didResetToOriginalContent) {
+                this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
+            }
         }));
     }
     clearCurrentEditLineDecoration() {
         if (this.modifiedModel.isDisposed()) {
             return;
         }
-        this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
-    }
-    _mirrorEdits(event) {
-        const edit = offsetEditFromContentChanges(event.changes);
-        if (this._isEditFromUs) {
-            const e_sum = this._edit;
-            const e_ai = edit;
-            this._edit = e_sum.compose(e_ai);
-        }
-        else {
-            const e_ai = this._edit;
-            const e_user = edit;
-            const e_user_r = e_user.tryRebase(e_ai.inverse(this.originalModel.getValue()), true);
-            if (e_user_r === undefined) {
-                this._edit = e_ai.compose(e_user);
-            }
-            else {
-                const edits = offsetEditToEditOperations(e_user_r, this.originalModel);
-                this.originalModel.applyEdits(edits);
-                this._edit = e_ai.tryRebase(e_user_r);
-            }
-            this._allEditsAreFromUs = false;
-            this._updateDiffInfoSeq();
-            const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
-            const currentState = this._stateObs.get();
-            switch (currentState) {
-                case ModifiedFileEntryState.Modified:
-                    if (didResetToOriginalContent) {
-                        this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
-                        break;
-                    }
-            }
-        }
+        this._textModelChangeService.clearCurrentEditLineDecoration();
     }
-    acceptAgentEdits(textEdits, isLastEdits, responseModel) {
-        const notebookEditor = this.notebookEditorService.retrieveExistingWidgetFromURI(this.notebookUri)?.value;
-        if (notebookEditor) {
-            const vm = notebookEditor.getCellByHandle(this.cell.handle);
-            vm?.updateEditState(CellEditState.Editing, 'chatEdit');
-        }
-        const ops = ( textEdits.map(TextEdit.asEditOperation));
-        const undoEdits = this._applyEdits(ops);
-        const maxLineNumber = undoEdits.reduce((max, op) => Math.max(max, op.range.startLineNumber), 0);
-        const newDecorations = [
-            {
-                options: ChatEditingNotebookCellEntry_1._pendingEditDecorationOptions,
-                range: ( new Range(maxLineNumber + 1, 1, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER))
-            }
-        ];
-        if (maxLineNumber > 0) {
-            newDecorations.push({
-                options: ChatEditingNotebookCellEntry_1._lastEditDecorationOptions,
-                range: ( new Range(maxLineNumber, 1, maxLineNumber, Number.MAX_SAFE_INTEGER))
-            });
-        }
-        this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, newDecorations);
+    async acceptAgentEdits(textEdits, isLastEdits, responseModel) {
+        const { maxLineNumber } = await this._textModelChangeService.acceptAgentEdits(this.modifiedModel.uri, textEdits, isLastEdits, responseModel);
         transaction((tx) => {
             if (!isLastEdits) {
                 this._stateObs.set(ModifiedFileEntryState.Modified, tx);
-                this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
                 this._maxModifiedLineNumber.set(maxLineNumber, tx);
             }
             else {
-                this._resetEditsState(tx);
-                this._updateDiffInfoSeq();
                 this._maxModifiedLineNumber.set(0, tx);
-                this._editDecorationClear.schedule();
             }
         });
     }
-    scheduleEditDecorations() {
-        this._editDecorationClear.schedule();
-    }
     revertMarkdownPreviewState() {
         if (this.cell.cellKind !== CellKind.Markup) {
             return;
@@ -195,107 +81,16 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
             }
         }
     }
-    _resetEditsState(tx) {
-        this._isCurrentlyBeingModifiedByObs.set(undefined, tx);
-        this._maxModifiedLineNumber.set(0, tx);
-    }
     async keep(change) {
-        return this._acceptHunk(change);
-    }
-    async _acceptHunk(change) {
-        this._isEditFromUs = true;
-        try {
-            if (!this._diffInfo.get().changes.filter(c => c.modified.equals(change.modified) && c.original.equals(change.original)).length) {
-                return false;
-            }
-            const edits = [];
-            for (const edit of change.innerChanges ?? []) {
-                const newText = this.modifiedModel.getValueInRange(edit.modifiedRange);
-                edits.push(EditOperation.replace(edit.originalRange, newText));
-            }
-            this.originalModel.pushEditOperations(null, edits, _ => null);
-        }
-        finally {
-            this._isEditFromUs = false;
-        }
-        await this._updateDiffInfoSeq();
-        if (this._diffInfo.get().identical) {
-            this.revertMarkdownPreviewState();
-            this._stateObs.set(ModifiedFileEntryState.Accepted, undefined);
-        }
-        return true;
+        return this._textModelChangeService.diffInfo.get().keep(change);
     }
     async undo(change) {
-        return this._rejectHunk(change);
-    }
-    async _rejectHunk(change) {
-        this._isEditFromUs = true;
-        try {
-            if (!this._diffInfo.get().changes.includes(change)) {
-                return false;
-            }
-            const edits = [];
-            for (const edit of change.innerChanges ?? []) {
-                const newText = this.originalModel.getValueInRange(edit.originalRange);
-                edits.push(EditOperation.replace(edit.modifiedRange, newText));
-            }
-            this.modifiedModel.pushEditOperations(null, edits, _ => null);
-        }
-        finally {
-            this._isEditFromUs = false;
-        }
-        await this._updateDiffInfoSeq();
-        if (this._diffInfo.get().identical) {
-            this.revertMarkdownPreviewState();
-            this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
-        }
-        return true;
-    }
-    _applyEdits(edits) {
-        this._isEditFromUs = true;
-        try {
-            let result = [];
-            this.modifiedModel.pushEditOperations(null, edits, (undoEdits) => {
-                result = undoEdits;
-                return null;
-            });
-            return result;
-        }
-        finally {
-            this._isEditFromUs = false;
-        }
-    }
-    async _updateDiffInfoSeq() {
-        const myDiffOperationId = ++this._diffOperationIds;
-        await Promise.resolve(this._diffOperation);
-        if (this._diffOperationIds === myDiffOperationId) {
-            const thisDiffOperation = this._updateDiffInfo();
-            this._diffOperation = thisDiffOperation;
-            await thisDiffOperation;
-        }
-    }
-    async _updateDiffInfo() {
-        if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
-            return;
-        }
-        const docVersionNow = this.modifiedModel.getVersionId();
-        const snapshotVersionNow = this.originalModel.getVersionId();
-        const ignoreTrimWhitespace = this._diffTrimWhitespace.get();
-        const diff = await this._editorWorkerService.computeDiff(this.originalModel.uri, this.modifiedModel.uri, { ignoreTrimWhitespace, computeMoves: false, maxComputationTimeMs: 3000 }, 'advanced');
-        if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
-            return;
-        }
-        if (this.modifiedModel.getVersionId() === docVersionNow && this.originalModel.getVersionId() === snapshotVersionNow) {
-            const diff2 = diff ?? nullDocumentDiff;
-            this._diffInfo.set(diff2, undefined);
-            this._edit = offsetEditFromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
-        }
+        return this._textModelChangeService.diffInfo.get().undo(change);
     }
 };
-ChatEditingNotebookCellEntry = ChatEditingNotebookCellEntry_1 = ( __decorate([
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IEditorWorkerService)),
-    ( __param(7, INotebookEditorService))
+ChatEditingNotebookCellEntry = ( __decorate([
+    ( __param(5, INotebookEditorService)),
+    ( __param(6, IInstantiationService))
 ], ChatEditingNotebookCellEntry));
 
 export { ChatEditingNotebookCellEntry };

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

@@ -18,7 +18,7 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 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 { NotebookModifiedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js';
-import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/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 { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
@@ -553,12 +553,12 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             modified: { resource: this._entry.modifiedURI },
             label: defaultAgentName
                 ? ( localize(
-                4802,
+                4884,
                 '{0} (changes from {1})',
                 basename(this._entry.modifiedURI),
                 defaultAgentName
             ))
-                : ( localize(4803, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                : ( localize(4885, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }

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

@@ -9,7 +9,6 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { ChatEditingNotebookSnapshotScheme, deserializeSnapshot } from './chatEditingModifiedNotebookSnapshot.js';
-import { ChatEditingSession } from '../chatEditingSession.js';
 
 var ChatEditingNotebookFileSystemProvider_1;
 let ChatEditingNotebookFileSystemProviderContrib = class ChatEditingNotebookFileSystemProviderContrib extends Disposable {
@@ -81,7 +80,7 @@ let ChatEditingNotebookFileSystemProvider = class ChatEditingNotebookFileSystemP
             throw ( new Error('File not found, viewType not found'));
         }
         const session = this._chatEditingService.getEditingSession(queryData.sessionId);
-        if (!(session instanceof ChatEditingSession) || !queryData.requestId) {
+        if (!session || !queryData.requestId) {
             throw ( new Error('File not found, session not found'));
         }
         const snapshotEntry = session.getSnapshot(queryData.requestId, queryData.undoStop || undefined, resource);

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-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/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

@@ -8,7 +8,7 @@ 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-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
 let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {

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-c3c61c00-c254-5856-9dc9-d7929c1f9062-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
+import { EditorGroupView } from '@codingame/monaco-vscode-33de3d75-8b1a-53f0-9e27-0c71c327e1a1-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-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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 { 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-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { cleanupOldImages, createFileForMedia } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-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 = document.createElement('div');
         this._domNode.className = 'element-selection-message';
         const message = document.createElement('span');
-        const startSelectionMessage = ( localize(4804, 'Add element to chat'));
+        const startSelectionMessage = ( localize(4886, 'Add element to chat'));
         message.textContent = startSelectionMessage;
         this._domNode.appendChild(message);
         let cts;
         const actions = [];
         actions.push(toAction({
             id: 'singleSelection',
-            label: ( localize(4805, 'Select an Element')),
+            label: ( localize(4887, 'Select an Element')),
             enabled: true,
             run: async () => { await startElementSelection(); }
         }), toAction({
             id: 'continuousSelection',
-            label: ( localize(4806, 'Continuous Selection')),
+            label: ( localize(4888, 'Continuous Selection')),
             enabled: true,
             run: async () => {
                 this._editor.focus();
                 cts = ( new CancellationTokenSource());
-                message.textContent = ( localize(4807, 'Selecting element...'));
+                message.textContent = ( localize(4889, 'Selecting element...'));
                 this.hideElement(startButton.element);
                 this.showElement(cancelButton.element);
-                cancelButton.label = ( localize(4808, 'Done'));
+                cancelButton.label = ( localize(4890, 'Done'));
                 while (!cts.token.isCancellationRequested) {
                     try {
                         await this.addElementToChat(cts);
@@ -102,7 +102,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
                         break;
                     }
                 }
-                message.textContent = ( localize(4809, 'Element added to chat'));
+                message.textContent = ( localize(4891, 'Element added to chat'));
                 finishedSelecting();
             }
         }));
@@ -111,27 +111,27 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
             addPrimaryActionToDropdown: false,
             contextMenuProvider: this.contextMenuService,
             supportShortLabel: true,
-            title: ( localize(4810, 'Click to select an element.')),
+            title: ( localize(4892, 'Click to select an element.')),
             supportIcons: true,
             ...defaultButtonStyles
         })));
-        startButton.primaryButton.label = ( localize(4811, 'Start'));
+        startButton.primaryButton.label = ( localize(4893, 'Start'));
         startButton.element.classList.add('element-selection-start');
         const cancelButton = this._showStore.add(( new Button(
             this._domNode,
-            { ...defaultButtonStyles, supportIcons: true, title: ( localize(4812, 'Click to cancel selection.')) }
+            { ...defaultButtonStyles, supportIcons: true, title: ( localize(4894, 'Click to cancel selection.')) }
         )));
         cancelButton.element.className = 'element-selection-cancel hidden';
-        const cancelButtonLabel = ( localize(4813, 'Cancel'));
+        const cancelButtonLabel = ( localize(4895, 'Cancel'));
         cancelButton.label = cancelButtonLabel;
-        const configure = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4814, "Configure Attachments Sent")) })));
+        const configure = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4896, "Configure Attachments Sent")) })));
         configure.icon = Codicon.gear;
-        const collapseOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4815, "Collapse Overlay")) })));
+        const collapseOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4897, "Collapse Overlay")) })));
         collapseOverlay.icon = Codicon.chevronRight;
-        const nextSelection = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4816, "Select Again")) })));
+        const nextSelection = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4898, "Select Again")) })));
         nextSelection.icon = Codicon.close;
         nextSelection.element.classList.add('hidden');
-        const expandOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4817, "Expand Overlay")) })));
+        const expandOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4899, "Expand Overlay")) })));
         expandOverlay.icon = Codicon.layout;
         const expandContainer = document.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(4807, 'Selecting element...'));
+            message.textContent = ( localize(4889, 'Selecting element...'));
             this.hideElement(startButton.element);
             this.showElement(cancelButton.element);
             await this.addElementToChat(cts);
-            message.textContent = ( localize(4809, 'Element added to chat'));
+            message.textContent = ( localize(4891, '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(4818, 'Selection canceled'));
+            message.textContent = ( localize(4900, '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(4819, 'Connecting to webview...'));
+            connectingWebviewElement.textContent = ( localize(4901, '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(4820, 'Please reopen the preview.'));
+                    connectingWebviewElement.textContent = ( localize(4902, 'Please reopen the preview.'));
                     return;
                 }
             }

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

@@ -10,8 +10,8 @@ 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-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { ChatEditorInput } from "@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
+import { IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatEditorInput } from "@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
 export interface IChatEditorOptions extends IEditorOptions {
     target?: {
         sessionId: string;

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

@@ -21,10 +21,11 @@ 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 { 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 { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
-import { ChatAgentLocation, ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { clearChatEditor } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
-import { ChatEditorInput } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { clearChatEditor } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
+import { ChatEditorInput } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 
 let ChatEditor = class ChatEditor extends EditorPane {
@@ -45,8 +46,9 @@ let ChatEditor = class ChatEditor extends EditorPane {
     createEditor(parent) {
         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, {
-            autoScroll: mode => mode !== ChatMode.Ask,
+            autoScroll: mode => mode !== ChatModeKind.Ask,
             renderFollowups: true,
             supportsFileReferences: true,
             rendererOptions: {
@@ -54,7 +56,7 @@ let ChatEditor = class ChatEditor extends EditorPane {
                     return true;
                 },
                 referencesExpandedWhenEmptyResponse: false,
-                progressMessageAtBottomOfResponse: mode => mode !== ChatMode.Ask,
+                progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask,
             },
             enableImplicitContext: true,
             enableWorkingSet: 'explicit',