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

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

@@ -7,7 +7,11 @@ import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IChatEditingExplanationModelManager } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.service";
+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";
 export interface IDocumentDiff2 extends IDocumentDiff {
     originalModel: ITextModel;
     modifiedModel: ITextModel;
@@ -19,6 +23,9 @@ export declare class ChatEditingCodeEditorIntegration implements IModifiedFileEn
     private readonly _editor;
     private readonly _editorService;
     private readonly _accessibilitySignalsService;
+    private readonly _explanationModelManager;
+    private readonly _chatWidgetService;
+    private readonly _viewsService;
     private static readonly _diffLineDecorationData;
     private readonly _currentIndex;
     readonly currentIndex: IObservable<number>;
@@ -30,7 +37,7 @@ export declare class ChatEditingCodeEditorIntegration implements IModifiedFileEn
     private readonly _diffHunkWidgets;
     private _viewZones;
     private readonly _accessibleDiffViewVisible;
-    constructor(_entry: IModifiedFileEntry, _editor: ICodeEditor, documentDiffInfo: IObservable<IDocumentDiff2>, renderDiffImmediately: boolean, _editorService: IEditorService, _accessibilitySignalsService: IAccessibilitySignalService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService);
+    constructor(_entry: IModifiedFileEntry, _editor: ICodeEditor, documentDiffInfo: IObservable<IDocumentDiff2>, renderDiffImmediately: boolean, _editorService: IEditorService, _accessibilitySignalsService: IAccessibilitySignalService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, _chatEditingService: IChatEditingService, _explanationModelManager: IChatEditingExplanationModelManager, _chatWidgetService: IChatWidgetService, _viewsService: IViewsService);
     dispose(): void;
     private _clear;
     private _clearDiffRendering;

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

@@ -32,11 +32,16 @@ import { EditorsOrder, isDiffEditorInput } from '@codingame/monaco-vscode-api/vs
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
 import { isTextDiffEditorForEntry } from './chatEditing.js';
 import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { ctxCursorInChangeRange } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
 import { LinkedList } from '@codingame/monaco-vscode-api/vscode/vs/base/common/linkedList';
+import { ChatEditingExplanationWidgetManager } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationWidget';
+import { IChatEditingExplanationModelManager } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.service';
+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 { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -63,13 +68,35 @@ class ObjectPool {
     }
 }
 let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
-    static { ChatEditingCodeEditorIntegration_1 = this; }
-    static { this._diffLineDecorationData = ModelDecorationOptions.register({ description: 'diff-line-decoration' }); }
-    constructor(_entry, _editor, documentDiffInfo, renderDiffImmediately, _editorService, _accessibilitySignalsService, contextKeyService, instantiationService) {
+    static {
+        ChatEditingCodeEditorIntegration_1 = this;
+    }
+    static {
+        this._diffLineDecorationData = ModelDecorationOptions.register({
+            description: "diff-line-decoration"
+        });
+    }
+    constructor(
+        _entry,
+        _editor,
+        documentDiffInfo,
+        renderDiffImmediately,
+        _editorService,
+        _accessibilitySignalsService,
+        contextKeyService,
+        instantiationService,
+        _chatEditingService,
+        _explanationModelManager,
+        _chatWidgetService,
+        _viewsService
+    ) {
         this._entry = _entry;
         this._editor = _editor;
         this._editorService = _editorService;
         this._accessibilitySignalsService = _accessibilitySignalsService;
+        this._explanationModelManager = _explanationModelManager;
+        this._chatWidgetService = _chatWidgetService;
+        this._viewsService = _viewsService;
         this._currentIndex = observableValue(this, -1);
         this.currentIndex = this._currentIndex;
         this._store = ( new DisposableStore());
@@ -82,8 +109,18 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         const codeEditorObs = observableCodeEditor(_editor);
         this._diffLineDecorations = this._editor.createDecorationsCollection();
         this._diffVisualDecorations = this._editor.createDecorationsCollection();
+        this._store.add(( new ChatEditingExplanationWidgetManager(
+            this._editor,
+            this._chatWidgetService,
+            this._viewsService,
+            this._explanationModelManager,
+            this._entry.modifiedURI
+        )));
         const enabledObs = derived(r => {
-            if (!isEqual(codeEditorObs.model.read(r)?.uri, documentDiffInfo.read(r).modifiedModel.uri)) {
+            if (!isEqual(
+                codeEditorObs.model.read(r)?.uri,
+                documentDiffInfo.read(r).modifiedModel.uri
+            )) {
                 return false;
             }
             if (this._editor.getOption(EditorOption.inDiffEditor) && !instantiationService.invokeFunction(isTextDiffEditorForEntry, _entry, this._editor)) {
@@ -113,10 +150,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         }));
         let lastModifyingRequestId;
         this._store.add(autorun(r => {
-            if (enabledObs.read(r)
-                && !_entry.isCurrentlyBeingModifiedBy.read(r)
-                && lastModifyingRequestId !== _entry.lastModifyingRequestId
-                && !documentDiffInfo.read(r).identical) {
+            if (enabledObs.read(r) && !_entry.isCurrentlyBeingModifiedBy.read(r) && lastModifyingRequestId !== _entry.lastModifyingRequestId && !documentDiffInfo.read(r).identical) {
                 lastModifyingRequestId = _entry.lastModifyingRequestId;
                 const position = _editor.getPosition() ?? ( new Position(1, 1));
                 const ranges = this._diffLineDecorations.getRanges();
@@ -156,20 +190,22 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 return;
             }
             const diff = documentDiffInfo.read(r);
-            const changeAtCursor = diff.changes.find(m => m.modified.contains(position.lineNumber) || m.modified.isEmpty && m.modified.startLineNumber === position.lineNumber);
+            const changeAtCursor = diff.changes.find(
+                m => m.modified.contains(position.lineNumber) || m.modified.isEmpty && m.modified.startLineNumber === position.lineNumber
+            );
             _ctxCursorInChangeRange.set(!!changeAtCursor);
             if (changeAtCursor) {
                 let signal;
                 if (changeAtCursor.modified.isEmpty) {
                     signal = AccessibilitySignal.diffLineDeleted;
-                }
-                else if (changeAtCursor.original.isEmpty) {
+                } else if (changeAtCursor.original.isEmpty) {
                     signal = AccessibilitySignal.diffLineInserted;
-                }
-                else {
+                } else {
                     signal = AccessibilitySignal.diffLineModified;
                 }
-                this._accessibilitySignalsService.playSignal(signal, { source: 'chatEditingEditor.cursorPositionChanged' });
+                this._accessibilitySignalsService.playSignal(signal, {
+                    source: "chatEditingEditor.cursorPositionChanged"
+                });
             }
         }));
         this._store.add(autorun(r => {
@@ -180,7 +216,17 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
             const accessibleDiffWidget = ( new AccessibleDiffViewContainer());
             _editor.addOverlayWidget(accessibleDiffWidget);
             r.store.add(toDisposable(() => _editor.removeOverlayWidget(accessibleDiffWidget)));
-            r.store.add(instantiationService.createInstance(AccessibleDiffViewer, accessibleDiffWidget.getDomNode(), enabledObs, (visible, tx) => this._accessibleDiffViewVisible.set(visible, tx), constObservable(true), ( codeEditorObs.layoutInfo.map((v, r) => v.width)), ( codeEditorObs.layoutInfo.map((v, r) => v.height)), ( documentDiffInfo.map(diff => diff.changes.slice())), instantiationService.createInstance(AccessibleDiffViewerModel, documentDiffInfo, _editor)));
+            r.store.add(instantiationService.createInstance(
+                AccessibleDiffViewer,
+                accessibleDiffWidget.getDomNode(),
+                enabledObs,
+                (visible, tx) => this._accessibleDiffViewVisible.set(visible, tx),
+                constObservable(true),
+                ( codeEditorObs.layoutInfo.map((v, r) => v.width)),
+                ( codeEditorObs.layoutInfo.map((v, r) => v.height)),
+                ( documentDiffInfo.map(diff => diff.changes.slice())),
+                instantiationService.createInstance(AccessibleDiffViewerModel, documentDiffInfo, _editor)
+            ));
         }));
         let actualOptions;
         const restoreActualOptions = () => {
@@ -204,12 +250,16 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 };
                 this._editor.updateOptions({
                     readOnly: true,
-                    stickyScroll: { enabled: false },
+                    stickyScroll: {
+                        enabled: false
+                    },
                     codeLens: false,
-                    guides: { indentation: false, bracketPairs: false }
+                    guides: {
+                        indentation: false,
+                        bracketPairs: false
+                    }
                 });
-            }
-            else {
+            } else {
                 restoreActualOptions();
             }
         }));
@@ -224,7 +274,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         this._currentIndex.set(-1, undefined);
     }
     _clearDiffRendering() {
-        this._editor.changeViewZones((viewZoneChangeAccessor) => {
+        this._editor.changeViewZones(viewZoneChangeAccessor => {
             for (const id of this._viewZones) {
                 viewZoneChangeAccessor.removeZone(id);
             }
@@ -243,13 +293,19 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         });
         const chatDiffWholeLineAddDecoration = ModelDecorationOptions.createDynamic({
             ...diffWholeLineAddDecoration,
-            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
         });
         const createOverviewDecoration = (overviewRulerColor, minimapColor) => {
             return ModelDecorationOptions.createDynamic({
-                description: 'chat-editing-decoration',
-                overviewRuler: { color: themeColorFromId(overviewRulerColor), position: OverviewRulerLane.Left },
-                minimap: { color: themeColorFromId(minimapColor), position: MinimapPosition.Gutter },
+                description: "chat-editing-decoration",
+                overviewRuler: {
+                    color: themeColorFromId(overviewRulerColor),
+                    position: OverviewRulerLane.Left
+                },
+                minimap: {
+                    color: themeColorFromId(minimapColor),
+                    position: MinimapPosition.Gutter
+                }
             });
         };
         const modifiedDecoration = createOverviewDecoration(overviewRulerModifiedForeground, minimapGutterModifiedBackground);
@@ -258,7 +314,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         this._diffHunksRenderStore.clear();
         this._diffHunkWidgets.length = 0;
         const diffHunkDecorations = [];
-        this._editor.changeViewZones((viewZoneChangeAccessor) => {
+        this._editor.changeViewZones(viewZoneChangeAccessor => {
             for (const id of this._viewZones) {
                 viewZoneChangeAccessor.removeZone(id);
             }
@@ -287,7 +343,8 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                         )));
                         if (!(i.originalRange.isEmpty() && i.originalRange.startLineNumber === 1 && i.modifiedRange.endLineNumber === editorLineCount) && !i.modifiedRange.isEmpty()) {
                             modifiedVisualDecorations.push({
-                                range: i.modifiedRange, options: chatDiffAddDecoration
+                                range: i.modifiedRange,
+                                options: chatDiffAddDecoration
                             });
                         }
                     }
@@ -304,8 +361,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                         range: diffEntry.modified.toInclusiveRange(),
                         options: addedDecoration
                     });
-                }
-                else if (diffEntry.modified.isEmpty) {
+                } else if (diffEntry.modified.isEmpty) {
                     modifiedVisualDecorations.push({
                         range: ( new Range(
                             diffEntry.modified.startLineNumber - 1,
@@ -315,8 +371,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                         )),
                         options: deletedDecoration
                     });
-                }
-                else {
+                } else {
                     modifiedVisualDecorations.push({
                         range: diffEntry.modified.toInclusiveRange(),
                         options: modifiedDecoration
@@ -324,8 +379,8 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 }
                 let extraLines = 0;
                 if (reviewMode && !diffMode) {
-                    const domNode = createElement('div');
-                    domNode.className = 'chat-editing-original-zone view-lines line-delete monaco-mouse-cursor-text';
+                    const domNode = createElement("div");
+                    domNode.className = "chat-editing-original-zone view-lines line-delete monaco-mouse-cursor-text";
                     const result = renderLines(source, renderOptions, decorations, domNode);
                     extraLines = result.heightInLines;
                     if (!isCreatedContent) {
@@ -343,11 +398,22 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                     if (!widget) {
                         widget = this._editor.invokeWithinContext(accessor => {
                             const instaService = accessor.get(IInstantiationService);
-                            return instaService.createInstance(DiffHunkWidget, this._editor, diff, diffEntry, this._editor.getModel().getVersionId(), isCreatedContent ? 0 : extraLines);
+                            return instaService.createInstance(
+                                DiffHunkWidget,
+                                this._editor,
+                                diff,
+                                diffEntry,
+                                this._editor.getModel().getVersionId(),
+                                isCreatedContent ? 0 : extraLines
+                            );
                         });
-                    }
-                    else {
-                        widget.update(diff, diffEntry, this._editor.getModel().getVersionId(), isCreatedContent ? 0 : extraLines);
+                    } else {
+                        widget.update(
+                            diff,
+                            diffEntry,
+                            this._editor.getModel().getVersionId(),
+                            isCreatedContent ? 0 : extraLines
+                        );
                     }
                     this._diffHunksRenderStore.add(toDisposable(() => {
                         this._diffHunkWidgetPool.putBack(widget);
@@ -362,7 +428,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                             Number.MAX_SAFE_INTEGER
                         )),
                         options: {
-                            description: 'diff-hunk-widget',
+                            description: "diff-hunk-widget",
                             stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
                         }
                     });
@@ -386,7 +452,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
             const idx = diffHunkDecoCollection.getRanges().findIndex(r => r.containsPosition(position));
             return idx;
         });
-        const toggleWidget = (activeWidget) => {
+        const toggleWidget = activeWidget => {
             const positionIdx = activeWidgetIdx.get();
             for (let i = 0; i < this._diffHunkWidgets.length; i++) {
                 const widget = this._diffHunkWidgets[i];
@@ -413,41 +479,39 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 const id = e.target.detail;
                 const widget = this._diffHunkWidgets.find(w => w.getId() === id);
                 toggleWidget(widget);
-            }
-            else if (e.target.type === MouseTargetType.CONTENT_VIEW_ZONE) {
+            } else if (e.target.type === MouseTargetType.CONTENT_VIEW_ZONE) {
                 const zone = e.target.detail;
                 const idx = this._viewZones.findIndex(id => id === zone.viewZoneId);
                 toggleWidget(this._diffHunkWidgets[idx]);
-            }
-            else if (e.target.position) {
-                const { position } = e.target;
+            } else if (e.target.position) {
+                const {
+                    position
+                } = e.target;
                 const idx = diffHunkDecoCollection.getRanges().findIndex(r => r.containsPosition(position));
                 toggleWidget(this._diffHunkWidgets[idx]);
-            }
-            else {
+            } else {
                 toggleWidget(undefined);
             }
         }));
-        this._diffHunksRenderStore.add(Event.any(this._editor.onDidScrollChange, this._editor.onDidLayoutChange)(() => {
-            for (let i = 0; i < this._diffHunkWidgets.length; i++) {
-                const widget = this._diffHunkWidgets[i];
-                const range = diffHunkDecoCollection.getRange(i);
-                if (range) {
-                    widget.layout(range?.startLineNumber);
-                }
-                else {
-                    widget.dispose();
+        this._diffHunksRenderStore.add(
+            Event.any(this._editor.onDidScrollChange, this._editor.onDidLayoutChange)(() => {
+                for (let i = 0; i < this._diffHunkWidgets.length; i++) {
+                    const widget = this._diffHunkWidgets[i];
+                    const range = diffHunkDecoCollection.getRange(i);
+                    if (range) {
+                        widget.layout(range?.startLineNumber);
+                    } else {
+                        widget.dispose();
+                    }
                 }
-            }
-        }));
+            })
+        );
     }
     enableAccessibleDiffView() {
         this._accessibleDiffViewVisible.set(true, undefined);
     }
     reveal(firstOrLast, preserveFocus) {
-        const decorations = this._diffLineDecorations
-            .getRanges()
-            .sort((a, b) => Range.compareRangesUsingStarts(a, b));
+        const decorations = this._diffLineDecorations.getRanges().sort((a, b) => Range.compareRangesUsingStarts(a, b));
         const index = firstOrLast ? 0 : decorations.length - 1;
         const range = decorations.at(index);
         if (range) {
@@ -471,9 +535,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
             this._currentIndex.set(-1, undefined);
             return false;
         }
-        const decorations = this._diffLineDecorations
-            .getRanges()
-            .sort((a, b) => Range.compareRangesUsingStarts(a, b));
+        const decorations = this._diffLineDecorations.getRanges().sort((a, b) => Range.compareRangesUsingStarts(a, b));
         if (decorations.length === 0) {
             this._currentIndex.set(-1, undefined);
             return false;
@@ -484,8 +546,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
             if (range.containsPosition(position)) {
                 newIndex = i + (next ? 1 : -1);
                 break;
-            }
-            else if (Position.isBefore(position, range.getStartPosition())) {
+            } else if (Position.isBefore(position, range.getStartPosition())) {
                 newIndex = next ? i : i - 1;
                 break;
             }
@@ -550,10 +611,16 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         const isDiffEditor = this._editor.getOption(EditorOption.inDiffEditor);
         if (show !== undefined ? show : !isDiffEditor) {
             const diffEditor = await this._editorService.openEditor({
-                original: { resource: this._entry.originalURI },
-                modified: { resource: this._entry.modifiedURI },
-                options: { selection },
-                label: ( localize(5129, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                original: {
+                    resource: this._entry.originalURI
+                },
+                modified: {
+                    resource: this._entry.modifiedURI
+                },
+                options: {
+                    selection
+                },
+                label: ( localize(5286, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
             });
             if (diffEditor && diffEditor.input) {
                 diffEditor.getControl()?.setSelection(selection);
@@ -563,9 +630,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                         d.dispose();
                         const editorIdents = [];
                         for (const candidate of this._editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
-                            if (isDiffEditorInput(candidate.editor)
-                                && isEqual(candidate.editor.original.resource, this._entry.originalURI)
-                                && isEqual(candidate.editor.modified.resource, this._entry.modifiedURI)) {
+                            if (isDiffEditorInput(candidate.editor) && isEqual(candidate.editor.original.resource, this._entry.originalURI) && isEqual(candidate.editor.modified.resource, this._entry.modifiedURI)) {
                                 editorIdents.push(candidate);
                             }
                         }
@@ -573,8 +638,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                     }
                 });
             }
-        }
-        else {
+        } else {
             await this._editorService.openEditor({
                 resource: this._entry.modifiedURI,
                 options: {
@@ -585,15 +649,14 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         }
     }
 };
-ChatEditingCodeEditorIntegration = ChatEditingCodeEditorIntegration_1 = ( __decorate([
-    ( __param(4, IEditorService)),
-    ( __param(5, IAccessibilitySignalService)),
-    ( __param(6, IContextKeyService)),
-    ( __param(7, IInstantiationService))
-], ChatEditingCodeEditorIntegration));
+ChatEditingCodeEditorIntegration = ChatEditingCodeEditorIntegration_1 = ( __decorate([( __param(4, IEditorService)), ( __param(5, IAccessibilitySignalService)), ( __param(6, IContextKeyService)), ( __param(7, IInstantiationService)), ( __param(8, IChatEditingService)), ( __param(9, IChatEditingExplanationModelManager)), ( __param(10, IChatWidgetService)), ( __param(11, IViewsService))], ChatEditingCodeEditorIntegration));
 let DiffHunkWidget = class DiffHunkWidget {
-    static { DiffHunkWidget_1 = this; }
-    static { this._idPool = 0; }
+    static {
+        DiffHunkWidget_1 = this;
+    }
+    static {
+        this._idPool = 0;
+    }
     constructor(_editor, _diffInfo, _change, _versionId, _lineDelta, instaService) {
         this._editor = _editor;
         this._diffInfo = _diffInfo;
@@ -603,23 +666,37 @@ let DiffHunkWidget = class DiffHunkWidget {
         this._id = `diff-change-widget-${DiffHunkWidget_1._idPool++}`;
         this._store = ( new DisposableStore());
         this._removed = false;
-        this._domNode = createElement('div');
-        this._domNode.className = 'chat-diff-change-content-widget';
+        this._domNode = createElement("div");
+        this._domNode.className = "chat-diff-change-content-widget";
         const toolbar = instaService.createInstance(MenuWorkbenchToolBar, this._domNode, MenuId.ChatEditingEditorHunk, {
-            telemetrySource: 'chatEditingEditorHunk',
+            telemetrySource: "chatEditingEditorHunk",
             hiddenItemStrategy: HiddenItemStrategy.NoHide,
-            toolbarOptions: { primaryGroup: () => true, },
+            toolbarOptions: {
+                primaryGroup: () => true
+            },
             menuOptions: {
                 renderShortTitle: true,
-                arg: this,
+                arg: this
             },
             actionViewItemProvider: (action, options) => {
+                const isPrimary = action.id === "chatEditor.action.acceptHunk";
                 if (!action.class) {
                     return new (class extends ActionViewItem {
                         constructor() {
-                            super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true , icon: false, label: true });
+                            super(undefined, action, {
+                                ...options,
+                                keybindingNotRenderedWithLabel: true ,
+                                icon: false,
+                                label: true
+                            });
                         }
-                    });
+                        render(container) {
+                            super.render(container);
+                            if (isPrimary) {
+                                this.element?.classList.add("primary");
+                            }
+                        }
+                    })();
                 }
                 return undefined;
             }
@@ -644,7 +721,11 @@ let DiffHunkWidget = class DiffHunkWidget {
     }
     layout(startLineNumber) {
         const lineHeight = this._editor.getOption(EditorOption.lineHeight);
-        const { contentLeft, contentWidth, verticalScrollbarWidth } = this._editor.getLayoutInfo();
+        const {
+            contentLeft,
+            contentWidth,
+            verticalScrollbarWidth
+        } = this._editor.getLayoutInfo();
         const scrollTop = this._editor.getScrollTop();
         this._position = {
             stackOrdinal: 1,
@@ -656,8 +737,7 @@ let DiffHunkWidget = class DiffHunkWidget {
         if (this._removed) {
             this._removed = false;
             this._editor.addOverlayWidget(this);
-        }
-        else {
+        } else {
             this._editor.layoutOverlayWidget(this);
         }
         this._lastStartLineNumber = startLineNumber;
@@ -667,7 +747,7 @@ let DiffHunkWidget = class DiffHunkWidget {
         this._removed = true;
     }
     toggle(show) {
-        this._domNode.classList.toggle('hover', show);
+        this._domNode.classList.toggle("hover", show);
         if (this._lastStartLineNumber) {
             this.layout(this._lastStartLineNumber);
         }
@@ -694,25 +774,26 @@ let DiffHunkWidget = class DiffHunkWidget {
         return this._diffInfo.keep(this._change);
     }
 };
-DiffHunkWidget = DiffHunkWidget_1 = ( __decorate([
-    ( __param(5, IInstantiationService))
-], DiffHunkWidget));
+DiffHunkWidget = DiffHunkWidget_1 = ( __decorate([( __param(5, IInstantiationService))], DiffHunkWidget));
 class AccessibleDiffViewContainer {
     constructor() {
-        this._domNode = createElement('div');
-        this._domNode.className = 'accessible-diff-view';
-        this._domNode.style.width = '100%';
-        this._domNode.style.position = 'absolute';
+        this._domNode = createElement("div");
+        this._domNode.className = "accessible-diff-view";
+        this._domNode.style.width = "100%";
+        this._domNode.style.position = "absolute";
     }
     getId() {
-        return 'chatEdits.accessibleDiffView';
+        return "chatEdits.accessibleDiffView";
     }
     getDomNode() {
         return this._domNode;
     }
     getPosition() {
         return {
-            preference: { top: 0, left: 0 },
+            preference: {
+                top: 0,
+                left: 0
+            },
             stackOrdinal: 1
         };
     }

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

@@ -0,0 +1,79 @@
+import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IDocumentDiff } from "../../../../../editor/common/diff/documentDiffProvider.js";
+import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IUndoRedoElement } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo";
+import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service";
+import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
+import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
+import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
+import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
+interface IMultiDiffEntryDelegate {
+    collapse: (transaction: ITransaction | undefined) => void;
+}
+/**
+ * Represents a file that has been deleted by the chat editing session.
+ * Unlike ChatEditingModifiedDocumentEntry, this doesn't maintain a live model
+ * since the file no longer exists on disk.
+ */
+export declare class ChatEditingDeletedFileEntry extends AbstractChatEditingModifiedFileEntry implements IModifiedFileEntry {
+    private readonly _multiDiffEntryDelegate;
+    private readonly _languageId;
+    private readonly _modelService;
+    private readonly _languageService;
+    readonly initialContent: string;
+    /**
+     * The original content before deletion, stored for diff display and potential restoration.
+     */
+    private readonly _originalContent;
+    /**
+     * Lazily created model for the original content (for diff display).
+     */
+    private _originalModel;
+    /**
+     * Lazily created empty model representing the deleted state (for diff display).
+     */
+    private _modifiedModel;
+    readonly originalURI: URI;
+    readonly diffInfo: IObservable<IDocumentDiff>;
+    readonly linesAdded: IObservable<number>;
+    readonly linesRemoved: IObservable<number>;
+    private readonly _changesCount;
+    readonly changesCount: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<number, void>;
+    readonly isDeletion = true;
+    constructor(resource: URI, originalContent: string, _multiDiffEntryDelegate: IMultiDiffEntryDelegate, telemetryInfo: IModifiedEntryTelemetryInfo, _languageId: string, _modelService: IModelService, _languageService: ILanguageService, configService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, fileService: IFileService, undoRedoService: IUndoRedoService, instantiationService: IInstantiationService, aiEditTelemetryService: IAiEditTelemetryService);
+    dispose(): void;
+    /**
+     * Gets or creates the original model for diff display.
+     */
+    private _getOrCreateOriginalModel;
+    /**
+     * Gets or creates an empty model representing the deleted state.
+     */
+    private _getOrCreateModifiedModel;
+    private _diffInfo;
+    getDiffInfo(): Promise<IDocumentDiff>;
+    equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
+    createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
+    restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
+    resetToInitialContent(): Promise<void>;
+    protected _areOriginalAndModifiedIdentical(): Promise<boolean>;
+    protected _createUndoRedoElement(response: IChatResponseModel): IUndoRedoElement;
+    acceptAgentEdits(_uri: URI, _edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, _responseModel: IChatResponseModel | undefined): Promise<void>;
+    protected _doAccept(): Promise<void>;
+    protected _doReject(): Promise<void>;
+    protected _createEditorIntegration(_editor: IEditorPane): IModifiedFileEntryEditorIntegration;
+    computeEditsFromSnapshots(_beforeSnapshot: string, _afterSnapshot: string): Promise<(TextEdit | ICellEditOperation)[]>;
+    save(): Promise<void>;
+    revertToDisk(): Promise<void>;
+}
+export {};