@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

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

@@ -12,10 +12,16 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { getKeyForChatSessionResource } from './chatEditingOperations.js';
 
-const STORAGE_CONTENTS_FOLDER = 'contents';
-const STORAGE_STATE_FILE = 'state.json';
+const STORAGE_CONTENTS_FOLDER = "contents";
+const STORAGE_STATE_FILE = "state.json";
 let ChatEditingSessionStorage = class ChatEditingSessionStorage {
-    constructor(_chatSessionResource, _fileService, _environmentService, _logService, _workspaceContextService) {
+    constructor(
+        _chatSessionResource,
+        _fileService,
+        _environmentService,
+        _logService,
+        _workspaceContextService
+    ) {
         this._chatSessionResource = _chatSessionResource;
         this._fileService = _fileService;
         this._environmentService = _environmentService;
@@ -25,12 +31,17 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
     }
     _getStorageLocation() {
         const workspaceId = this._workspaceContextService.getWorkspace().id;
-        return joinPath(this._environmentService.workspaceStorageHome, workspaceId, 'chatEditingSessions', this.storageKey);
+        return joinPath(
+            this._environmentService.workspaceStorageHome,
+            workspaceId,
+            "chatEditingSessions",
+            this.storageKey
+        );
     }
     async restoreState() {
         const storageLocation = this._getStorageLocation();
         const fileContents = ( new Map());
-        const getFileContent = (hash) => {
+        const getFileContent = hash => {
             let readPromise = fileContents.get(hash);
             if (!readPromise) {
                 readPromise = this._fileService.readFile(joinPath(storageLocation, STORAGE_CONTENTS_FOLDER, hash)).then(content => ( content.value.toString()));
@@ -38,7 +49,7 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
             }
             return readPromise;
         };
-        const deserializeSnapshotEntriesDTO = async (dtoEntries) => {
+        const deserializeSnapshotEntriesDTO = async dtoEntries => {
             const entries = ( new ResourceMap());
             for (const entryDTO of dtoEntries) {
                 const entry = await deserializeSnapshotEntry(entryDTO);
@@ -46,11 +57,14 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
             }
             return entries;
         };
-        const deserializeChatEditingStopDTO = async (stopDTO) => {
+        const deserializeChatEditingStopDTO = async stopDTO => {
             const entries = await deserializeSnapshotEntriesDTO(stopDTO.entries);
-            return { stopId: 'stopId' in stopDTO ? stopDTO.stopId : undefined, entries };
+            return {
+                stopId: "stopId" in stopDTO ? stopDTO.stopId : undefined,
+                entries
+            };
         };
-        const deserializeSnapshotEntry = async (entry) => {
+        const deserializeSnapshotEntry = async entry => {
             return {
                 resource: ( URI.parse(entry.resource)),
                 languageId: entry.languageId,
@@ -67,8 +81,9 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                     modelId: entry.telemetryInfo.modelId,
                     modeId: entry.telemetryInfo.modeId,
                     applyCodeBlockSuggestionId: entry.telemetryInfo.applyCodeBlockSuggestionId,
-                    feature: entry.telemetryInfo.feature,
-                }
+                    feature: entry.telemetryInfo.feature
+                },
+                isDeleted: entry.isDeleted
             };
         };
         try {
@@ -91,10 +106,9 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
             return {
                 initialFileContents,
                 recentSnapshot,
-                timeline: revive(data.timeline),
+                timeline: revive(data.timeline)
             };
-        }
-        catch (e) {
+        } catch (e) {
             this._logService.error(`Error restoring chat editing session from ${( storageLocation.toString())}`, e);
         }
         return undefined;
@@ -110,18 +124,16 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                     existingContents.add(child.name);
                 }
             });
-        }
-        catch (e) {
+        } catch (e) {
             try {
                 await this._fileService.createFolder(contentsFolder);
-            }
-            catch (e) {
+            } catch (e) {
                 this._logService.error(`Error creating chat editing session content folder ${( contentsFolder.toString())}`, e);
                 return;
             }
         }
         const contentWritePromises = ( new Map());
-        const writeContent = async (content) => {
+        const writeContent = async content => {
             const buffer = VSBuffer.fromString(content);
             const hash = (await hashAsync(buffer)).substring(0, 7);
             if (!( existingContents.has(hash))) {
@@ -129,7 +141,7 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
             }
             return hash;
         };
-        const addFileContent = async (content) => {
+        const addFileContent = async content => {
             let storedContentHash = contentWritePromises.get(content);
             if (!storedContentHash) {
                 storedContentHash = writeContent(content);
@@ -140,13 +152,13 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
         const serializeResourceMap = async (resourceMap, serialize) => {
             return await Promise.all(( Array.from(resourceMap.entries()).map(async ([resourceURI, value]) => [( resourceURI.toString()), await serialize(value)])));
         };
-        const serializeChatEditingSessionStop = async (stop) => {
+        const serializeChatEditingSessionStop = async stop => {
             return {
                 stopId: stop.stopId,
                 entries: await Promise.all(( Array.from(( stop.entries.values())).map(serializeSnapshotEntry)))
             };
         };
-        const serializeSnapshotEntry = async (entry) => {
+        const serializeSnapshotEntry = async entry => {
             return {
                 resource: ( entry.resource.toString()),
                 languageId: entry.languageId,
@@ -154,7 +166,14 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                 currentHash: await addFileContent(entry.current),
                 state: entry.state,
                 snapshotUri: ( entry.snapshotUri.toString()),
-                telemetryInfo: { requestId: entry.telemetryInfo.requestId, agentId: entry.telemetryInfo.agentId, command: entry.telemetryInfo.command, modelId: entry.telemetryInfo.modelId, modeId: entry.telemetryInfo.modeId }
+                telemetryInfo: {
+                    requestId: entry.telemetryInfo.requestId,
+                    agentId: entry.telemetryInfo.agentId,
+                    command: entry.telemetryInfo.command,
+                    modelId: entry.telemetryInfo.modelId,
+                    modeId: entry.telemetryInfo.modeId
+                },
+                isDeleted: entry.isDeleted
             };
         };
         try {
@@ -162,12 +181,14 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                 version: STORAGE_VERSION,
                 initialFileContents: await serializeResourceMap(state.initialFileContents, value => addFileContent(value)),
                 timeline: state.timeline,
-                recentSnapshot: await serializeChatEditingSessionStop(state.recentSnapshot),
+                recentSnapshot: await serializeChatEditingSessionStop(state.recentSnapshot)
             };
             this._logService.debug(`chatEditingSession: Storing editing session at ${( storageFolder.toString())}: ${contentWritePromises.size} files`);
-            await this._fileService.writeFile(joinPath(storageFolder, STORAGE_STATE_FILE), VSBuffer.fromString(JSON.stringify(data)));
-        }
-        catch (e) {
+            await this._fileService.writeFile(
+                joinPath(storageFolder, STORAGE_STATE_FILE),
+                VSBuffer.fromString(JSON.stringify(data))
+            );
+        } catch (e) {
             this._logService.debug(`Error storing chat editing session to ${( storageFolder.toString())}`, e);
         }
     }
@@ -176,20 +197,16 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
         if (await this._fileService.exists(storageFolder)) {
             this._logService.debug(`chatEditingSession: Clearing editing session at ${( storageFolder.toString())}`);
             try {
-                await this._fileService.del(storageFolder, { recursive: true });
-            }
-            catch (e) {
+                await this._fileService.del(storageFolder, {
+                    recursive: true
+                });
+            } catch (e) {
                 this._logService.debug(`Error clearing chat editing session from ${( storageFolder.toString())}`, e);
             }
         }
     }
 };
-ChatEditingSessionStorage = ( __decorate([
-    ( __param(1, IFileService)),
-    ( __param(2, IEnvironmentService)),
-    ( __param(3, ILogService)),
-    ( __param(4, IWorkspaceContextService))
-], ChatEditingSessionStorage));
+ChatEditingSessionStorage = ( __decorate([( __param(1, IFileService)), ( __param(2, IEnvironmentService)), ( __param(3, ILogService)), ( __param(4, IWorkspaceContextService))], ChatEditingSessionStorage));
 const COMPATIBLE_STORAGE_VERSIONS = [1, 2];
 const STORAGE_VERSION = 2;
 

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

@@ -41,35 +41,43 @@ import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 
 var ChatEditingTextModelChangeService_1;
 let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService extends Disposable {
-    static { ChatEditingTextModelChangeService_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)
-        }
-    }); }
-    static { this._atomicEditDecorationOptions = ModelDecorationOptions.register({
-        isWholeLine: true,
-        description: 'chat-atomic-edit',
-        className: 'chat-editing-atomic-edit',
-        minimap: {
-            position: MinimapPosition.Inline,
-            color: themeColorFromId(pendingRewriteMinimap)
-        }
-    }); }
+    static {
+        ChatEditingTextModelChangeService_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)
+            }
+        });
+    }
+    static {
+        this._atomicEditDecorationOptions = ModelDecorationOptions.register({
+            isWholeLine: true,
+            description: "chat-atomic-edit",
+            className: "chat-editing-atomic-edit",
+            minimap: {
+                position: MinimapPosition.Inline,
+                color: themeColorFromId(pendingRewriteMinimap)
+            }
+        });
+    }
     get isEditFromUs() {
         return this._isEditFromUs;
     }
@@ -89,10 +97,20 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
     }
     notifyHunkAction(state, affectedLines) {
         if (affectedLines.lineCount > 0) {
-            this._didAcceptOrRejectLines.fire({ state, ...affectedLines });
+            this._didAcceptOrRejectLines.fire({
+                state,
+                ...affectedLines
+            });
         }
     }
-    constructor(originalModel, modifiedModel, state, isExternalEditInProgress, _editorWorkerService, _accessibilitySignalService) {
+    constructor(
+        originalModel,
+        modifiedModel,
+        state,
+        isExternalEditInProgress,
+        _editorWorkerService,
+        _accessibilitySignalService
+    ) {
         super();
         this.originalModel = originalModel;
         this.modifiedModel = modifiedModel;
@@ -103,10 +121,9 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         this._allEditsAreFromUs = true;
         this._diffOperationIds = 0;
         this._diffInfo = observableValue(this, nullDocumentDiff);
-        this._editDecorationClear = this._register(( new RunOnceScheduler(
-            () => { this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []); },
-            500
-        )));
+        this._editDecorationClear = this._register(( new RunOnceScheduler(() => {
+            this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
+        }, 500)));
         this._editDecorations = [];
         this._didAcceptOrRejectAllHunks = this._register(( new Emitter()));
         this.onDidAcceptOrRejectAllHunks = this._didAcceptOrRejectAllHunks.event;
@@ -153,8 +170,14 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         return diff ? diff.identical : false;
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {
-        assertType(textEdits.every(TextEdit.isTextEdit), 'INVALID args, can only handle text edits');
-        assert(isEqual(resource, this.modifiedModel.uri), ' INVALID args, can only edit THIS document');
+        assertType(
+            textEdits.every(TextEdit.isTextEdit),
+            "INVALID args, can only handle text edits"
+        );
+        assert(
+            isEqual(resource, this.modifiedModel.uri),
+            " INVALID args, can only edit THIS document"
+        );
         const isAtomicEdits = textEdits.length > 0 && isLastEdits;
         let maxLineNumber = 0;
         let rewriteRatio = 0;
@@ -169,39 +192,36 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
                     const op = undoEdits[i];
                     if (!range) {
                         range = Range.lift(op.range);
-                    }
-                    else {
+                    } else {
                         range = Range.plusRange(range, op.range);
                     }
                 }
                 if (range) {
                     const defer = ( new DeferredPromise());
-                    const listener = addDisposableListener(getWindow(undefined), 'animationend', e => {
-                        if (e.animationName === 'kf-chat-editing-atomic-edit') {
+                    const listener = addDisposableListener(getWindow(undefined), "animationend", e => {
+                        if (e.animationName === "kf-chat-editing-atomic-edit") {
                             defer.complete();
                             listener.dispose();
                         }
                     });
                     this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, [{
-                            options: ChatEditingTextModelChangeService_1._atomicEditDecorationOptions,
-                            range
-                        }]);
+                        options: ChatEditingTextModelChangeService_1._atomicEditDecorationOptions,
+                        range
+                    }]);
                     await Promise.any([defer.p, timeout(500)]);
                     listener.dispose();
                 }
             }
-        }
-        else {
+        } else {
             const ops = ( textEdits.map(TextEdit.asEditOperation));
             const undoEdits = this._applyEdits(ops, source);
             maxLineNumber = undoEdits.reduce((max, op) => Math.max(max, op.range.startLineNumber), 0);
             rewriteRatio = Math.min(1, maxLineNumber / this.modifiedModel.getLineCount());
             const newDecorations = [
-                {
-                    options: ChatEditingTextModelChangeService_1._pendingEditDecorationOptions,
-                    range: ( new Range(maxLineNumber + 1, 1, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER))
-                }
-            ];
+            {
+                options: ChatEditingTextModelChangeService_1._pendingEditDecorationOptions,
+                range: ( new Range(maxLineNumber + 1, 1, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER))
+            }];
             if (maxLineNumber > 0) {
                 newDecorations.push({
                     options: ChatEditingTextModelChangeService_1._lastEditDecorationOptions,
@@ -214,11 +234,16 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             this._updateDiffInfoSeq();
             this._editDecorationClear.schedule();
         }
-        return { rewriteRatio, maxLineNumber };
+        return {
+            rewriteRatio,
+            maxLineNumber
+        };
     }
     _createEditSource(responseModel) {
         if (!responseModel) {
-            return EditSources.unknown({ name: 'editSessionUndoRedo' });
+            return EditSources.unknown({
+                name: "editSessionUndoRedo"
+            });
         }
         const sessionId = responseModel.session.sessionId;
         const request = responseModel.session.getRequests().at(-1);
@@ -231,7 +256,7 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
                 requestId: request?.id,
                 sessionId,
                 languageId,
-                extensionId,
+                extensionId
             });
         }
         return EditSources.chatApplyEdits({
@@ -241,7 +266,7 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             languageId,
             mode: request?.modeInfo?.modeId,
             extensionId,
-            codeBlockSuggestionId: request?.modeInfo?.applyCodeBlockSuggestionId,
+            codeBlockSuggestionId: request?.modeInfo?.applyCodeBlockSuggestionId
         });
     }
     _applyEdits(edits, source) {
@@ -251,25 +276,36 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         try {
             this._isEditFromUs = true;
             let result = [];
-            this.modifiedModel.pushEditOperations(null, edits, (undoEdits) => {
+            this.modifiedModel.pushEditOperations(null, edits, undoEdits => {
                 result = undoEdits;
                 return null;
             }, undefined, source);
             return result;
-        }
-        finally {
+        } finally {
             this._isEditFromUs = false;
         }
     }
     keep() {
-        this.notifyHunkAction('accepted', { linesAdded: this.linesAdded, linesRemoved: this.linesRemoved, lineCount: this.lineChangeCount, hasRemainingEdits: false });
+        this.notifyHunkAction("accepted", {
+            linesAdded: this.linesAdded,
+            linesRemoved: this.linesRemoved,
+            lineCount: this.lineChangeCount,
+            hasRemainingEdits: false
+        });
         this.originalModel.setValue(this.modifiedModel.createSnapshot());
         this._reset();
     }
     undo() {
-        this.notifyHunkAction('rejected', { linesAdded: this.linesAdded, linesRemoved: this.linesRemoved, lineCount: this.lineChangeCount, hasRemainingEdits: false });
+        this.notifyHunkAction("rejected", {
+            linesAdded: this.linesAdded,
+            linesRemoved: this.linesRemoved,
+            lineCount: this.lineChangeCount,
+            hasRemainingEdits: false
+        });
         this.modifiedModel.pushStackElement();
-        this._applyEdits([(EditOperation.replace(this.modifiedModel.getFullModelRange(), this.originalModel.getValue()))], EditSources.chatUndoEdits());
+        this._applyEdits([
+            (EditOperation.replace(this.modifiedModel.getFullModelRange(), this.originalModel.getValue()))
+        ], EditSources.chatUndoEdits());
         this.modifiedModel.pushStackElement();
         this._reset();
     }
@@ -286,7 +322,9 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         }
         if (newModified !== undefined && this.modifiedModel.getValue() !== newModified) {
             this.modifiedModel.pushStackElement();
-            this._applyEdits([(EditOperation.replace(this.modifiedModel.getFullModelRange(), newModified))], EditSources.chatReset());
+            this._applyEdits([
+                (EditOperation.replace(this.modifiedModel.getFullModelRange(), newModified))
+            ], EditSources.chatReset());
             this.modifiedModel.pushStackElement();
             didChange = true;
         }
@@ -304,15 +342,13 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             if (isExternalEdit) {
                 this._updateDiffInfoSeq();
             }
-        }
-        else {
+        } else {
             const e_ai = this._originalToModifiedEdit;
             const e_user = edit;
             const e_user_r = e_user.tryRebase(e_ai.inverse(this.originalModel.getValue()));
             if (e_user_r === undefined) {
                 this._originalToModifiedEdit = e_ai.compose(e_user);
-            }
-            else {
+            } else {
                 const edits = offsetEditToEditOperations(e_user_r, this.originalModel);
                 this.originalModel.applyEdits(edits);
                 this._originalToModifiedEdit = e_ai.rebaseSkipConflicting(e_user_r);
@@ -335,11 +371,13 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             edits.push(EditOperation.replace(edit.originalRange, newText));
         }
         this.originalModel.pushEditOperations(null, edits, _ => null);
-        await this._updateDiffInfoSeq('accepted');
+        await this._updateDiffInfoSeq("accepted");
         if (this._diffInfo.get().identical) {
             this._didAcceptOrRejectAllHunks.fire(ModifiedFileEntryState.Accepted);
         }
-        this._accessibilitySignalService.playSignal(AccessibilitySignal.editsKept, { allowManyInParallel: true });
+        this._accessibilitySignalService.playSignal(AccessibilitySignal.editsKept, {
+            allowManyInParallel: true
+        });
         return true;
     }
     async _undoHunk(change) {
@@ -352,11 +390,13 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             edits.push(EditOperation.replace(edit.modifiedRange, newText));
         }
         this.modifiedModel.pushEditOperations(null, edits, _ => null);
-        await this._updateDiffInfoSeq('rejected');
+        await this._updateDiffInfoSeq("rejected");
         if (this._diffInfo.get().identical) {
             this._didAcceptOrRejectAllHunks.fire(ModifiedFileEntryState.Rejected);
         }
-        this._accessibilitySignalService.playSignal(AccessibilitySignal.editsUndone, { allowManyInParallel: true });
+        this._accessibilitySignalService.playSignal(AccessibilitySignal.editsUndone, {
+            allowManyInParallel: true
+        });
         return true;
     }
     async getDiffInfo() {
@@ -405,7 +445,7 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             ignoreTrimWhitespace: false,
             computeMoves: false,
             maxComputationTimeMs: 3000
-        }, 'advanced');
+        }, "advanced");
         if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed() || this._store.isDisposed) {
             return undefined;
         }
@@ -418,9 +458,6 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         return undefined;
     }
 };
-ChatEditingTextModelChangeService = ChatEditingTextModelChangeService_1 = ( __decorate([
-    ( __param(4, IEditorWorkerService)),
-    ( __param(5, IAccessibilitySignalService))
-], ChatEditingTextModelChangeService));
+ChatEditingTextModelChangeService = ChatEditingTextModelChangeService_1 = ( __decorate([( __param(4, IEditorWorkerService)), ( __param(5, IAccessibilitySignalService))], ChatEditingTextModelChangeService));
 
 export { ChatEditingTextModelChangeService };

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

@@ -6,13 +6,21 @@ import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/com
 
 var ChatEditingTextModelContentProvider_1;
 let ChatEditingTextModelContentProvider = class ChatEditingTextModelContentProvider {
-    static { ChatEditingTextModelContentProvider_1 = this; }
-    static { this.scheme = Schemas.chatEditingModel; }
+    static {
+        ChatEditingTextModelContentProvider_1 = this;
+    }
+    static {
+        this.scheme = Schemas.chatEditingModel;
+    }
     static getFileURI(chatSessionResource, documentId, path) {
         return ( URI.from({
             scheme: ChatEditingTextModelContentProvider_1.scheme,
             path,
-            query: JSON.stringify({ kind: 'doc', documentId, chatSessionResource }),
+            query: JSON.stringify({
+                kind: "doc",
+                documentId,
+                chatSessionResource
+            })
         }));
     }
     constructor(_chatEditingService, _modelService) {
@@ -33,15 +41,18 @@ let ChatEditingTextModelContentProvider = class ChatEditingTextModelContentProvi
         return this._modelService.getModel(entry.originalURI);
     }
 };
-ChatEditingTextModelContentProvider = ChatEditingTextModelContentProvider_1 = ( __decorate([
-    ( __param(1, IModelService))
-], ChatEditingTextModelContentProvider));
+ChatEditingTextModelContentProvider = ChatEditingTextModelContentProvider_1 = ( __decorate([( __param(1, IModelService))], ChatEditingTextModelContentProvider));
 let ChatEditingSnapshotTextModelContentProvider = class ChatEditingSnapshotTextModelContentProvider {
     static getSnapshotFileURI(chatSessionResource, requestId, undoStop, path, scheme) {
         return ( URI.from({
             scheme: Schemas.chatEditingSnapshotScheme,
             path,
-            query: JSON.stringify({ session: chatSessionResource, requestId: requestId ?? '', undoStop: undoStop ?? '', scheme }),
+            query: JSON.stringify({
+                session: chatSessionResource,
+                requestId: requestId ?? "",
+                undoStop: undoStop ?? "",
+                scheme
+            })
         }));
     }
     constructor(_chatEditingService, _modelService) {
@@ -61,8 +72,6 @@ let ChatEditingSnapshotTextModelContentProvider = class ChatEditingSnapshotTextM
         return session.getSnapshotModel(data.requestId, data.undoStop || undefined, resource);
     }
 };
-ChatEditingSnapshotTextModelContentProvider = ( __decorate([
-    ( __param(1, IModelService))
-], ChatEditingSnapshotTextModelContentProvider));
+ChatEditingSnapshotTextModelContentProvider = ( __decorate([( __param(1, IModelService))], ChatEditingSnapshotTextModelContentProvider));
 
 export { ChatEditingSnapshotTextModelContentProvider, ChatEditingTextModelContentProvider };

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

@@ -8,6 +8,8 @@
 	transition: opacity 0.2s ease-in-out;
 	display: flex;
 	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	border-radius: 6px;
+	overflow: hidden;
 }
 
 .chat-diff-change-content-widget.hover {
@@ -15,25 +17,43 @@
 }
 
 .chat-diff-change-content-widget .monaco-action-bar {
-	padding: 2px;
-	border-radius: 2px;
-	background-color: var(--vscode-button-background);
-	color: var(--vscode-button-foreground);
+	padding: 4px 4px;
+	border-radius: 6px;
+	background-color: var(--vscode-editorWidget-background);
+	color: var(--vscode-foreground);
 	border: 1px solid var(--vscode-contrastBorder);
+	overflow: hidden;
+}
+
+.chat-diff-change-content-widget .monaco-action-bar .actions-container {
+	gap: 4px;
 }
 
 .chat-diff-change-content-widget .monaco-action-bar .action-item .action-label {
-	border-radius: 2px;
+	border-radius: 4px;
+	font-size: 11px;
+	line-height: 14px;
+	padding: 4px 6px;
+}
+
+.chat-diff-change-content-widget .monaco-action-bar .action-item.primary .action-label {
+	background-color: var(--vscode-button-background);
 	color: var(--vscode-button-foreground);
-	padding: 2px 5px;
 }
 
-.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon {
-	width: unset;
-	padding: 2px;
+.monaco-workbench .chat-diff-change-content-widget .monaco-action-bar .action-item.primary .action-label:hover {
+	background-color: var(--vscode-button-hoverBackground);
+}
+
+.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon:not(.separator) {
+	width: 22px; /* align with default icon button dimensions */
+	height: 22px;
+	padding: 0;
 	font-size: 16px;
-	line-height: 16px;
-	color: var(--vscode-button-foreground);
+	line-height: 22px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 }
 
 .chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon[class*='codicon-'] {