@codingame/monaco-vscode-chat-service-override 26.2.2 → 28.0.0

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

@@ -2,10 +2,8 @@ import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { IObservable, IReader, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { IEditSessionDiffStats, IEditSessionEntryDiff, IModifiedEntryTelemetryInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
@@ -40,8 +38,6 @@ export declare class ChatEditingCheckpointTimelineImpl implements IChatEditingCh
     private readonly _delegate;
     private readonly _notebookEditorModelResolverService;
     private readonly _notebookService;
-    private readonly _instantiationService;
-    private readonly _modelService;
     private readonly _textModelService;
     private readonly _editorWorkerService;
     private readonly _configurationService;
@@ -51,6 +47,7 @@ export declare class ChatEditingCheckpointTimelineImpl implements IChatEditingCh
     private readonly _operations;
     private readonly _fileBaselines;
     private readonly _refCountedDiffs;
+    private readonly _finalizedDiffCache;
     /** Gets the checkpoint, if any, we can 'undo' to. */
     private readonly _willUndoToCheckpoint;
     readonly canUndo: IObservable<boolean>;
@@ -61,7 +58,7 @@ export declare class ChatEditingCheckpointTimelineImpl implements IChatEditingCh
     private readonly _willRedoToEpoch;
     readonly canRedo: IObservable<boolean>;
     readonly requestDisablement: IObservable<IChatRequestDisablement[]>;
-    constructor(chatSessionResource: URI, _delegate: IChatEditingTimelineFsDelegate, _notebookEditorModelResolverService: INotebookEditorModelResolverService, _notebookService: INotebookService, _instantiationService: IInstantiationService, _modelService: IModelService, _textModelService: ITextModelService, _editorWorkerService: IEditorWorkerService, _configurationService: IConfigurationService);
+    constructor(chatSessionResource: URI, _delegate: IChatEditingTimelineFsDelegate, _notebookEditorModelResolverService: INotebookEditorModelResolverService, _notebookService: INotebookService, _textModelService: ITextModelService, _editorWorkerService: IEditorWorkerService, _configurationService: IConfigurationService);
     createCheckpoint(requestId: string | undefined, undoStopId: string | undefined, label: string, description?: string): string;
     undoToLastCheckpoint(): Promise<void>;
     redoToNextCheckpoint(): Promise<void>;

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

@@ -11,14 +11,13 @@ import { equals as equals$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
-import { TextModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { DefaultEndOfLine, ValidAnnotatedEditOperation, EndOfLinePreference } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
+import { createTextBuffer } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
 import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { CellUri, CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
@@ -30,9 +29,9 @@ import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
+import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
 import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/promise';
-import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 
 const START_REQUEST_EPOCH = "$$start";
 const STOP_ID_EPOCH_PREFIX = "__epoch_";
@@ -42,8 +41,6 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         _delegate,
         _notebookEditorModelResolverService,
         _notebookService,
-        _instantiationService,
-        _modelService,
         _textModelService,
         _editorWorkerService,
         _configurationService
@@ -52,8 +49,6 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         this._delegate = _delegate;
         this._notebookEditorModelResolverService = _notebookEditorModelResolverService;
         this._notebookService = _notebookService;
-        this._instantiationService = _instantiationService;
-        this._modelService = _modelService;
         this._textModelService = _textModelService;
         this._editorWorkerService = _editorWorkerService;
         this._configurationService = _configurationService;
@@ -65,6 +60,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         }, []);
         this._fileBaselines = ( new Map());
         this._refCountedDiffs = ( new Map());
+        this._finalizedDiffCache = ( new Map());
         this._willUndoToCheckpoint = derived(reader => {
             const currentEpoch = this._currentEpoch.read(reader);
             const checkpoints = this._checkpoints.read(reader);
@@ -99,7 +95,15 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                 return undefined;
             }
             const nextOperation = operations.find(op => op.epoch >= currentEpoch);
-            const nextCheckpoint = nextOperation && checkpoints.find(op => op.epoch > nextOperation.epoch);
+            if (!nextOperation) {
+                const nextRequestStart = checkpoints.find(cp => cp.epoch >= currentEpoch && cp.undoStopId === undefined);
+                if (!nextRequestStart) {
+                    return maxEncounteredEpoch + 1;
+                }
+                const requestAfter = checkpoints.find(cp => cp.epoch > nextRequestStart.epoch && cp.undoStopId === undefined);
+                return requestAfter ? requestAfter.epoch : (maxEncounteredEpoch + 1);
+            }
+            const nextCheckpoint = checkpoints.find(op => op.epoch > nextOperation.epoch);
             const currentCheckpoint = findLast(checkpoints, cp => cp.epoch < currentEpoch);
             if (currentCheckpoint && nextOperation && currentCheckpoint.requestId !== nextOperation.requestId) {
                 const startOfNextRequestIdx = findLastIdx(
@@ -571,31 +575,16 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         }
     }
     _applyTextEditsToContent(content, edits) {
-        const makeModel = (uri, contents) => this._instantiationService.createInstance(
-            TextModel,
-            contents,
-            "",
-            this._modelService.getCreationOptions("", uri, true),
-            uri
-        );
-        const tempUri = ( URI.from({
-            scheme: "temp",
-            path: `/temp-${Date.now()}.txt`
-        }));
-        const model = makeModel(tempUri, content);
+        const {
+            textBuffer,
+            disposable
+        } = createTextBuffer(content, DefaultEndOfLine.LF);
         try {
-            model.applyEdits(( edits.map(edit => ({
-                range: {
-                    startLineNumber: edit.range.startLineNumber,
-                    startColumn: edit.range.startColumn,
-                    endLineNumber: edit.range.endLineNumber,
-                    endColumn: edit.range.endColumn
-                },
-                text: edit.text
-            }))));
-            return model.getValue();
+            textBuffer.applyEdits(( edits.map(edit => ( new ValidAnnotatedEditOperation(null, Range.lift(edit.range), edit.text, false, false, false)))), false, false);
+            const fullRange = textBuffer.getRangeAt(0, textBuffer.getLength());
+            return textBuffer.getValueInRange(fullRange, EndOfLinePreference.TextDefined);
         } finally {
-            model.dispose();
+            disposable.dispose();
         }
     }
     getEntryDiffBetweenStops(uri, requestId, stopId) {
@@ -639,14 +628,18 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
     }
     _getEntryDiffBetweenEpochs(uri, cacheKey, epochs) {
         const key = `${( uri.toString())}\0${cacheKey}`;
+        const cached = this._finalizedDiffCache.get(key);
+        if (cached) {
+            return constObservable(cached);
+        }
         let obs = this._refCountedDiffs.get(key);
         if (!obs) {
-            obs = this._getEntryDiffBetweenEpochsInner(uri, epochs, () => this._refCountedDiffs.delete(key));
+            obs = this._getEntryDiffBetweenEpochsInner(uri, key, epochs, () => this._refCountedDiffs.delete(key));
             this._refCountedDiffs.set(key, obs);
         }
         return obs;
     }
-    _getEntryDiffBetweenEpochsInner(uri, epochs, onLastObserverRemoved) {
+    _getEntryDiffBetweenEpochsInner(uri, cacheKey, epochs, onLastObserverRemoved) {
         const modelRefsPromise = derived(this, reader => {
             const {
                 start,
@@ -744,6 +737,9 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             }
             const promised = result.promise?.promiseResult.read(reader);
             if (promised?.data) {
+                if (promised.data.isFinal) {
+                    this._finalizedDiffCache.set(cacheKey, promised.data);
+                }
                 return promised.data;
             }
             if (promised?.error) {
@@ -887,6 +883,6 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         });
     }
 };
-ChatEditingCheckpointTimelineImpl = ( __decorate([( __param(2, INotebookEditorModelResolverService)), ( __param(3, INotebookService)), ( __param(4, IInstantiationService)), ( __param(5, IModelService)), ( __param(6, ITextModelService)), ( __param(7, IEditorWorkerService)), ( __param(8, IConfigurationService))], ChatEditingCheckpointTimelineImpl));
+ChatEditingCheckpointTimelineImpl = ( __decorate([( __param(2, INotebookEditorModelResolverService)), ( __param(3, INotebookService)), ( __param(4, ITextModelService)), ( __param(5, IEditorWorkerService)), ( __param(6, IConfigurationService))], ChatEditingCheckpointTimelineImpl));
 
 export { ChatEditingCheckpointTimelineImpl };

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

@@ -620,7 +620,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 options: {
                     selection
                 },
-                label: ( localize(5320, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+                label: ( localize(5822, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
             });
             if (diffEditor && diffEditor.input) {
                 diffEditor.getControl()?.setSelection(selection);

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

@@ -8,7 +8,6 @@ import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/res
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { ChatMessageRole } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -121,33 +120,16 @@ let ChatEditingExplanationModelManager = class ChatEditingExplanationModelManage
         }));
         const totalChanges = fileChanges.reduce((sum, f) => sum + f.changes.length, 0);
         try {
-            let models = await this._languageModelsService.selectLanguageModels({
+            const models = await this._languageModelsService.selectLanguageModels({
                 vendor: "copilot",
-                family: "claude-3.5-sonnet"
+                id: "copilot-fast"
             });
-            if (!models.length) {
-                models = await this._languageModelsService.selectLanguageModels({
-                    vendor: "copilot",
-                    family: "gpt-4o"
-                });
-            }
-            if (!models.length) {
-                models = await this._languageModelsService.selectLanguageModels({
-                    vendor: "copilot",
-                    family: "gpt-4"
-                });
-            }
-            if (!models.length) {
-                models = await this._languageModelsService.selectLanguageModels({
-                    vendor: "copilot"
-                });
-            }
             if (!models.length) {
                 for (const fileData of fileChanges) {
                     this._updateUriStatePartial(fileData.uri, {
                         progress: "error",
                         explanations: [],
-                        errorMessage: ( localize(5356, "No language model available"))
+                        errorMessage: ( localize(5858, "No language model available"))
                     });
                 }
                 return;
@@ -180,7 +162,7 @@ Be specific about the actual code changes. Return ONLY valid JSON, no markdown.
 
 Example response format:
 [{"explanation": "Added null check to prevent crash"}, {"explanation": "Renamed variable for clarity"}]`;
-            const response = await this._languageModelsService.sendChatRequest(models[0], ( new ExtensionIdentifier("core")), [{
+            const response = await this._languageModelsService.sendChatRequest(models[0], undefined, [{
                 role: ChatMessageRole.User,
                 content: [{
                     type: "text",
@@ -218,7 +200,7 @@ Example response format:
             for (const fileData of fileChanges) {
                 const explanations = [];
                 for (const data of fileData.changes) {
-                    const parsedExplanation = parsed[parsedIndex]?.explanation?.trim() || ( localize(5357, "Code was modified."));
+                    const parsedExplanation = parsed[parsedIndex]?.explanation?.trim() || ( localize(5859, "Code was modified."));
                     explanations.push({
                         uri: fileData.uri,
                         startLineNumber: data.startLineNumber,
@@ -236,7 +218,7 @@ Example response format:
             }
         } catch (e) {
             if (!cancellationToken.isCancellationRequested) {
-                const errorMessage = e instanceof Error ? e.message : ( localize(5358, "Failed to generate explanations"));
+                const errorMessage = e instanceof Error ? e.message : ( localize(5860, "Failed to generate explanations"));
                 for (const fileData of fileChanges) {
                     this._updateUriStatePartial(fileData.uri, {
                         progress: "error",

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

@@ -141,7 +141,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             if (inProgress) {
                 const res = this._lastModifyingResponseObs.read(r);
                 const req = res && res.session.getRequests().find(value => value.id === res.requestId);
-                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(5371, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(5873, "Chat Edits")));
             } else {
                 resourceFilter.clear();
             }
@@ -183,7 +183,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(5372, "Chat Edit: '{0}'", request.message.text)) : ( localize(5373, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5874, "Chat Edit: '{0}'", request.message.text)) : ( localize(5875, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, "chat.edit", this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {

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

@@ -42,7 +42,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(5374, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(5876, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static {
         AbstractChatEditingModifiedFileEntry_1 = this;

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

@@ -485,7 +485,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(5375, "Chat Edit: '{0}'", request.message.text)) : ( localize(5376, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5877, "Chat Edit: '{0}'", request.message.text)) : ( localize(5878, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);

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

@@ -124,7 +124,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: "join.chatEditingSession",
-                label: ( localize(5377, "Saving chat edits history"))
+                label: ( localize(5879, "Saving chat edits history"))
             });
         }));
     }
@@ -346,7 +346,7 @@ class ChatDecorationsProvider extends Disposable {
     constructor(_sessions) {
         super();
         this._sessions = _sessions;
-        this.label = ( localize(5378, "Chat Editing"));
+        this.label = ( localize(5880, "Chat Editing"));
         this._currentEntries = derived(this, r => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -390,7 +390,7 @@ class ChatDecorationsProvider extends Disposable {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: ( localize(5379, "Pending changes from chat")),
+                tooltip: ( localize(5881, "Pending changes from chat")),
                 bubble: true
             };
         }

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

@@ -390,7 +390,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
             if (this._editorPane.isVisible()) {
                 return;
             } else if (this._editorPane.input) {
-                await this._editorGroupsService.activeGroup.openEditor(this._editorPane.input, {
+                await this._editorService.openEditor(this._editorPane.input, {
                     pinned: true,
                     activation: EditorActivation.ACTIVATE
                 });
@@ -399,9 +399,9 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(5380, "Suggested Edits"))
+            label: ( localize(5882, "Suggested Edits"))
         }, this._instantiationService);
-        this._editorPane = await this._editorGroupsService.activeGroup.openEditor(input, {
+        this._editorPane = await this._editorService.openEditor(input, {
             pinned: true,
             activation: EditorActivation.ACTIVATE
         });

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

@@ -36,6 +36,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
+import { chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 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';
 
@@ -245,7 +246,7 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
                 name: "editSessionUndoRedo"
             });
         }
-        const sessionId = responseModel.session.sessionId;
+        const sessionId = chatSessionResourceToId(responseModel.session.sessionResource);
         const request = responseModel.session.getRequests().at(-1);
         const languageId = this.modifiedModel.getLanguageId();
         const agent = responseModel.agent;

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditorController.css

@@ -7,7 +7,7 @@
 	opacity: 0;
 	transition: opacity 0.2s ease-in-out;
 	display: flex;
-	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	box-shadow: var(--vscode-shadow-md);
 	border-radius: 6px;
 	overflow: hidden;
 }
@@ -21,7 +21,7 @@
 	border-radius: 6px;
 	background-color: var(--vscode-editorWidget-background);
 	color: var(--vscode-foreground);
-	border: 1px solid var(--vscode-contrastBorder);
+	border: 1px solid var(--vscode-editorWidget-border);
 	overflow: hidden;
 }
 

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

@@ -630,7 +630,7 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             modified: {
                 resource: this._entry.modifiedURI
             },
-            label: ( localize(5381, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+            label: ( localize(5883, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }

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

@@ -10,7 +10,7 @@ import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/editor';
 import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { MODAL_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
@@ -24,7 +24,7 @@ import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/th
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 
-const languageModelsOpenSettingsIcon = registerIcon("language-models-open-settings", Codicon.goToFile, ( localize(5382, "Icon for open language models settings commands.")));
+const languageModelsOpenSettingsIcon = registerIcon("language-models-open-settings", Codicon.goToFile, ( localize(5884, "Icon for open language models settings commands.")));
 const LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION = ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
     ChatContextKeys.Entitlement.planFree,
     ChatContextKeys.Entitlement.planPro,
@@ -34,11 +34,11 @@ const LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION = ( ContextKeyExpr.and(ChatContex
     ChatContextKeys.Entitlement.internal
 ))));
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(ChatManagementEditor, ChatManagementEditor.ID, ( localize(5383, "Chat Management Editor"))),
+    EditorPaneDescriptor.create(ChatManagementEditor, ChatManagementEditor.ID, ( localize(5885, "Chat Management Editor"))),
     [( new SyncDescriptor(ChatManagementEditorInput))]
 );
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(5384, "Models Management Editor"))),
+    EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(5886, "Models Management Editor"))),
     [( new SyncDescriptor(ModelsManagementEditorInput))]
 );
 class ChatManagementEditorInputSerializer {
@@ -80,17 +80,17 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
             constructor() {
                 super({
                     id: MANAGE_CHAT_COMMAND_ID,
-                    title: ( localize2(5385, "Manage Language Models")),
+                    title: ( localize2(5887, "Manage Language Models")),
                     category: CHAT_CATEGORY,
                     precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
                     f1: true
                 });
             }
             async run(accessor, args) {
-                const editorGroupsService = accessor.get(IEditorGroupsService);
-                return editorGroupsService.activeGroup.openEditor(( new ModelsManagementEditorInput()), {
+                const editorService = accessor.get(IEditorService);
+                return editorService.openEditor(( new ModelsManagementEditorInput()), {
                     pinned: true
-                });
+                }, MODAL_GROUP);
             }
         }));
         this._register(registerAction2(class extends Action2 {
@@ -103,7 +103,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
                         weight: KeybindingWeight.EditorContrib,
                         when: CONTEXT_MODELS_SEARCH_FOCUS
                     },
-                    title: ( localize2(5386, "Clear Models Search Results"))
+                    title: ( localize2(5888, "Clear Models Search Results"))
                 });
             }
             run(accessor) {
@@ -118,7 +118,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
             constructor() {
                 super({
                     id: "workbench.action.openLanguageModelsJson",
-                    title: ( localize2(5387, "Open Language Models (JSON)")),
+                    title: ( localize2(5889, "Open Language Models (JSON)")),
                     category: CHAT_CATEGORY,
                     precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
                     f1: true
@@ -136,7 +136,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
         MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
             command: {
                 id: MANAGE_CHAT_COMMAND_ID,
-                title: ( localize2(5385, "Manage Language Models")),
+                title: ( localize2(5887, "Manage Language Models")),
                 icon: languageModelsOpenSettingsIcon
             },
             when: openModelsManagementEditorWhen,
@@ -147,7 +147,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
         MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
             command: {
                 id: "workbench.action.openLanguageModelsJson",
-                title: ( localize2(5387, "Open Language Models (JSON)")),
+                title: ( localize2(5889, "Open Language Models (JSON)")),
                 icon: languageModelsOpenSettingsIcon
             },
             when: openLanguageModelsJsonWhen,

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

@@ -47,6 +47,7 @@ export declare class ChatManagementEditor extends EditorPane {
     private sections;
     private readonly commandService;
     private readonly chatEntitlementService;
+    private readonly actionButtonClickListener;
     constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, instantiationService: IInstantiationService, commandService: ICommandService, chatEntitlementService: IChatEntitlementService);
     protected createEditor(parent: HTMLElement): void;
     updateStyles(): void;

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

@@ -32,7 +32,7 @@ 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 { PANEL_BORDER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
-import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { CONTEXT_MODELS_EDITOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { Orientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/sash/sash';
@@ -102,7 +102,7 @@ let ModelsManagementEditor = class ModelsManagementEditor extends EditorPane {
     }
 };
 ModelsManagementEditor = ModelsManagementEditor_1 = ( __decorate([( __param(1, ITelemetryService)), ( __param(2, IThemeService)), ( __param(3, IStorageService)), ( __param(4, IInstantiationService)), ( __param(5, IContextKeyService))], ModelsManagementEditor));
-const chatManagementSashBorder = registerColor("chatManagement.sashBorder", PANEL_BORDER, ( localize(5388, "The color of the Chat Management editor splitview sash border.")));
+const chatManagementSashBorder = registerColor("chatManagement.sashBorder", PANEL_BORDER, ( localize(5890, "The color of the Chat Management editor splitview sash border.")));
 function isNewUser(chatEntitlementService) {
     return !chatEntitlementService.sentiment.installed || chatEntitlementService.entitlement === ChatEntitlement.Available;
 }
@@ -132,6 +132,7 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
         this.instantiationService = instantiationService;
         this.selectedSection = CHAT_MANAGEMENT_SECTION_USAGE;
         this.sections = [];
+        this.actionButtonClickListener = this._register(( new MutableDisposable()));
         this.commandService = commandService;
         this.chatEntitlementService = chatEntitlementService;
     }
@@ -191,10 +192,10 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
     renderSidebar(parent) {
         this.sections = [{
             id: CHAT_MANAGEMENT_SECTION_USAGE,
-            label: ( localize(5389, "Usage"))
+            label: ( localize(5891, "Usage"))
         }, {
             id: CHAT_MANAGEMENT_SECTION_MODELS,
-            label: ( localize(5390, "Models"))
+            label: ( localize(5892, "Models"))
         }];
         const delegate = ( new SectionItemDelegate());
         const renderer = ( new SectionItemRenderer());
@@ -208,7 +209,7 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
                         return element.label;
                     },
                     getWidgetAriaLabel() {
-                        return localize(5391, "Sections");
+                        return localize(5893, "Sections");
                     }
                 },
                 openOnSingleClick: true,
@@ -233,7 +234,7 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
         const headerTitleContainer = append(this.headerContainer, $(".header-title-container"));
         const headerTitleWrapper = append(headerTitleContainer, $(".header-title-wrapper"));
         const tile = append(headerTitleWrapper, $(".ai-management-editor-title"));
-        tile.textContent = ( localize(5392, "Copilot"));
+        tile.textContent = ( localize(5894, "Copilot"));
         this.planBadge = append(headerTitleWrapper, $(".plan-badge"));
         const titleButtonContainer = append(headerTitleContainer, $(".header-upgrade-button-container"));
         this.actionButton = this._register(( new Button(titleButtonContainer, {
@@ -288,7 +289,7 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
                 this.planBadge.style.display = "none";
             } else {
                 this.planBadge.style.display = "";
-                this.planBadge.textContent = ( localize(5393, "Free"));
+                this.planBadge.textContent = ( localize(5895, "Free"));
             }
         } else {
             this.planBadge.style.display = "";
@@ -302,29 +303,29 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
             let commandId;
             if (shouldUpgrade && !isFreePlan && !anonymousUser) {
                 if (this.chatEntitlementService.entitlement === ChatEntitlement.Pro) {
-                    buttonLabel = ( localize(5394, "Upgrade to Copilot Pro+"));
+                    buttonLabel = ( localize(5896, "Upgrade to Copilot Pro+"));
                 } else {
-                    buttonLabel = ( localize(5395, "Upgrade to Copilot Pro"));
+                    buttonLabel = ( localize(5897, "Upgrade to Copilot Pro"));
                 }
                 commandId = "workbench.action.chat.upgradePlan";
             } else if (shouldUpgrade && (isFreePlan || anonymousUser)) {
-                buttonLabel = ( localize(5396, "Upgrade to Copilot Pro"));
+                buttonLabel = ( localize(5898, "Upgrade to Copilot Pro"));
                 commandId = "workbench.action.chat.upgradePlan";
             } else if (newUser) {
-                buttonLabel = ( localize(5397, "Use AI Features"));
+                buttonLabel = ( localize(5899, "Use AI Features"));
                 commandId = newUser && anonymousUser ? "workbench.action.chat.triggerSetupAnonymousWithoutDialog" : "workbench.action.chat.triggerSetup";
             } else if (anonymousUser) {
-                buttonLabel = ( localize(5398, "Enable more AI Features"));
+                buttonLabel = ( localize(5900, "Enable more AI Features"));
                 commandId = "workbench.action.chat.triggerSetup";
             } else if (disabled) {
-                buttonLabel = ( localize(5399, "Enable AI Features"));
+                buttonLabel = ( localize(5901, "Enable AI Features"));
                 commandId = "workbench.action.chat.triggerSetup";
             } else {
-                buttonLabel = ( localize(5400, "Sign in to use AI Features"));
+                buttonLabel = ( localize(5902, "Sign in to use AI Features"));
                 commandId = "workbench.action.chat.triggerSetup";
             }
             this.actionButton.label = buttonLabel;
-            this.actionButton.onDidClick(() => {
+            this.actionButtonClickListener.value = this.actionButton.onDidClick(() => {
                 this.commandService.executeCommand(commandId);
             });
         } else {