@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

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

@@ -2,24 +2,21 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as chatEditingEditorOverlay from '../media/chatEditingEditorOverlay.css';
-import { DisposableStore, MutableDisposable, toDisposable, DisposableMap, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, toDisposable, MutableDisposable, DisposableMap, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { WorkingSetEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
-import { append, addDisposableGenericMouseMoveListener, reset } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { renderIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
-import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { append, $, addDisposableGenericMouseMoveListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { navigationBearingFakeActionId, AcceptAction, RejectAction } from './chatEditingEditorActions.js';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { EditorGroupView } from '@codingame/monaco-vscode-ad89fae6-94f0-5ac2-a185-22dea4b68ee0-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
+import { EditorGroupView } from '@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -27,31 +24,118 @@ import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vsco
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { ObservableEditorSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
-import { rcut } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
-import { observableFromEvent, observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { renderIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { renderStringAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
+import { observableFromEvent, observableFromEventOpts, observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
 import { observableValue, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
 
 registerCss(chatEditingEditorOverlay);
-let ChatEditorOverlayWidget = class ChatEditorOverlayWidget {
-    constructor(_editor, _chatService, instaService) {
+let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
+    constructor(_editor, _chatService, _instaService) {
+        super();
         this._editor = _editor;
         this._chatService = _chatService;
-        this._showStore = ( new DisposableStore());
+        this._instaService = _instaService;
+        this._showStore = this._store.add(( new DisposableStore()));
         this._session = observableValue(this, undefined);
         this._entry = observableValue(this, undefined);
         this._navigationBearings = observableValue(this, { changeCount: -1, activeIdx: -1, entriesCount: -1 });
         this._domNode = document.createElement('div');
         this._domNode.classList.add('chat-editor-overlay-widget');
+        this._isBusy = derived(r => {
+            const session = this._session.read(r);
+            const chatModel = session && _chatService.getSession(session?.chatSessionId);
+            const lastResponse = chatModel
+                ? observableFromEvent(this, chatModel.onDidChange, () => chatModel.getRequests().at(-1)?.response).read(r)
+                : undefined;
+            return lastResponse
+                ? observableFromEvent(this, lastResponse.onDidChange, () => !lastResponse.isPendingConfirmation && !lastResponse.isComplete).read(r)
+                : false;
+        });
+        const requestMessage = derived(r => {
+            const session = this._session.read(r);
+            const chatModel = this._chatService.getSession(session?.chatSessionId ?? '');
+            if (!session || !chatModel) {
+                return undefined;
+            }
+            const response = this._entry.read(r)?.lastModifyingResponse.read(r);
+            if (!response) {
+                return { message: ( localize(4739, "Working...")) };
+            }
+            if (response.isPaused.read(r)) {
+                return { message: ( localize(4740, "Paused")), paused: true };
+            }
+            const lastPart = observableFromEventOpts({ equalsFn: equals }, response.onDidChange, () => response.response.value)
+                .read(r)
+                .filter(part => part.kind === 'progressMessage' || part.kind === 'toolInvocation')
+                .at(-1);
+            if (lastPart?.kind === 'toolInvocation') {
+                return { message: lastPart.invocationMessage };
+            }
+            else if (lastPart?.kind === 'progressMessage') {
+                return { message: lastPart.content };
+            }
+            else {
+                return { message: ( localize(4739, "Working...")) };
+            }
+        });
         const progressNode = document.createElement('div');
         progressNode.classList.add('chat-editor-overlay-progress');
         append(progressNode, renderIcon(ThemeIcon.modify(Codicon.loading, 'spin')));
+        const textProgress = append(progressNode, $('span.progress-message'));
         this._domNode.appendChild(progressNode);
-        const toolbarNode = document.createElement('div');
-        toolbarNode.classList.add('chat-editor-overlay-toolbar');
-        this._domNode.appendChild(toolbarNode);
-        this._toolbar = instaService.createInstance(MenuWorkbenchToolBar, toolbarNode, MenuId.ChatEditingEditorContent, {
+        this._store.add(autorun(r => {
+            const value = requestMessage.read(r);
+            const busy = this._isBusy.read(r) && !value?.paused;
+            this._domNode.classList.toggle('busy', busy);
+            if (!busy || !value || this._session.read(r)?.isGlobalEditingSession) {
+                textProgress.innerText = '';
+            }
+            else if (value) {
+                textProgress.innerText = renderStringAsPlaintext(value.message);
+            }
+        }));
+        this._toolbarNode = document.createElement('div');
+        this._toolbarNode.classList.add('chat-editor-overlay-toolbar');
+    }
+    dispose() {
+        this.hide();
+        super.dispose();
+    }
+    getDomNode() {
+        return this._domNode;
+    }
+    show(session, entry, indicies) {
+        this._showStore.clear();
+        transaction(tx => {
+            this._session.set(session, tx);
+            this._entry.set(entry, tx);
+        });
+        this._showStore.add(autorun(r => {
+            const entryIndex = indicies.entryIndex.read(r);
+            const changeIndex = indicies.changeIndex.read(r);
+            const entries = session.entries.read(r);
+            let activeIdx = entryIndex !== undefined && changeIndex !== undefined
+                ? changeIndex
+                : -1;
+            let totalChangesCount = 0;
+            for (let i = 0; i < entries.length; i++) {
+                const changesCount = entries[i].changesCount.read(r);
+                totalChangesCount += changesCount;
+                if (entryIndex !== undefined && i < entryIndex) {
+                    activeIdx += changesCount;
+                }
+            }
+            this._navigationBearings.set({ changeCount: totalChangesCount, activeIdx, entriesCount: entries.length }, undefined);
+        }));
+        this._domNode.appendChild(this._toolbarNode);
+        this._showStore.add(toDisposable(() => this._toolbarNode.remove()));
+        this._showStore.add(this._instaService.createInstance(MenuWorkbenchToolBar, this._toolbarNode, MenuId.ChatEditingEditorContent, {
             telemetrySource: 'chatEditor.overlayToolbar',
             hiddenItemStrategy: HiddenItemStrategy.Ignore,
             toolbarOptions: {
@@ -74,10 +158,10 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget {
                                 const { changeCount, activeIdx } = that._navigationBearings.read(r);
                                 if (changeCount > 0) {
                                     const n = activeIdx === -1 ? '1' : `${activeIdx + 1}`;
-                                    this.label.innerText = ( localize(4675, "{0} of {1}", n, changeCount));
+                                    this.label.innerText = ( localize(4741, "{0} of {1}", n, changeCount));
                                 }
                                 else {
-                                    this.label.innerText = ( localize(4676, "0 of 0"));
+                                    this.label.innerText = ( localize(4742, "—"));
                                 }
                                 this.updateTooltip();
                             }));
@@ -87,18 +171,23 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget {
                             if (changeCount === -1 || entriesCount === -1) {
                                 return undefined;
                             }
-                            else if (changeCount === 1 && entriesCount === 1) {
-                                return localize(4677, "1 change in 1 file");
+                            let result;
+                            if (changeCount === 1 && entriesCount === 1) {
+                                result = ( localize(4743, "1 change in 1 file"));
                             }
                             else if (changeCount === 1) {
-                                return localize(4678, "1 change in {0} files", entriesCount);
+                                result = ( localize(4744, "1 change in {0} files", entriesCount));
                             }
                             else if (entriesCount === 1) {
-                                return localize(4679, "{0} changes in 1 file", changeCount);
+                                result = ( localize(4745, "{0} changes in 1 file", changeCount));
                             }
                             else {
-                                return localize(4680, "{0} changes in {1} files", changeCount, entriesCount);
+                                result = ( localize(4746, "{0} changes in {1} files", changeCount, entriesCount));
+                            }
+                            if (!that._isBusy.get()) {
+                                return result;
                             }
+                            return localize(4747, "{0} - Working...", result);
                         }
                     });
                 }
@@ -140,106 +229,8 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget {
                         }
                     });
                 }
-                if (action.id === 'inlineChat2.reveal' || action.id === 'workbench.action.chat.openEditSession') {
-                    return new (class extends ActionViewItem {
-                        constructor() {
-                            super(undefined, action, options);
-                            this._requestMessage = derived(r => {
-                                const session = that._session.read(r);
-                                const chatModel = that._chatService.getSession(session?.chatSessionId ?? '');
-                                if (!session || !chatModel) {
-                                    return undefined;
-                                }
-                                const response = that._entry.read(r)?.isCurrentlyBeingModifiedBy.read(r);
-                                if (response) {
-                                    if (response?.isPaused.read(r)) {
-                                        return { message: ( localize(4681, "Edits Paused")), paused: true };
-                                    }
-                                    const entry = that._entry.read(r);
-                                    if (entry) {
-                                        const progress = entry?.rewriteRatio.read(r);
-                                        const message = progress === 0
-                                            ? ( localize(4682, "Generating edits"))
-                                            : ( localize(4683, "{0}% Applying edits", Math.round(progress * 100)));
-                                        return { message };
-                                    }
-                                }
-                                if (session.isGlobalEditingSession) {
-                                    return undefined;
-                                }
-                                const request = observableFromEvent(this, chatModel.onDidChange, () => chatModel.getRequests().at(-1)).read(r);
-                                if (!request || request.response?.isComplete) {
-                                    return undefined;
-                                }
-                                return { message: request.message.text };
-                            });
-                        }
-                        render(container) {
-                            super.render(container);
-                            container.classList.add('label-item');
-                            this._store.add(autorun(r => {
-                                assertType(this.label);
-                                const value = this._requestMessage.read(r);
-                                if (!value) {
-                                    this.options.icon = true;
-                                    this.options.label = false;
-                                    reset(this.label);
-                                    this.updateClass();
-                                    this.updateLabel();
-                                    this.updateTooltip();
-                                }
-                                else {
-                                    this.options.icon = false;
-                                    this.options.label = true;
-                                    this.updateClass();
-                                    this.updateTooltip();
-                                    const message = rcut(value.message, 47);
-                                    reset(this.label, message);
-                                }
-                                const busy = Boolean(value && !value.paused);
-                                that._domNode.classList.toggle('busy', busy);
-                                this.label.classList.toggle('busy', busy);
-                            }));
-                        }
-                        getTooltip() {
-                            return this._requestMessage.get()?.message || super.getTooltip();
-                        }
-                    });
-                }
                 return undefined;
             }
-        });
-    }
-    dispose() {
-        this.hide();
-        this._showStore.dispose();
-        this._toolbar.dispose();
-    }
-    getDomNode() {
-        return this._domNode;
-    }
-    show(session, entry, indicies) {
-        this._showStore.clear();
-        transaction(tx => {
-            this._session.set(session, tx);
-            this._entry.set(entry, tx);
-        });
-        this._showStore.add(autorun(r => {
-            const entryIndex = indicies.entryIndex.read(r);
-            const changeIndex = indicies.changeIndex.read(r);
-            const entries = session.entries.read(r);
-            let activeIdx = entryIndex !== undefined && changeIndex !== undefined
-                ? changeIndex
-                : -1;
-            let totalChangesCount = 0;
-            for (let i = 0; i < entries.length; i++) {
-                const changesCount = entries[i].changesCount.read(r);
-                totalChangesCount += changesCount;
-                if (entryIndex !== undefined && i < entryIndex) {
-                    activeIdx += changesCount;
-                }
-            }
-            this._navigationBearings.set({ changeCount: totalChangesCount, activeIdx, entriesCount: entries.length }, undefined);
         }));
     }
     hide() {
@@ -305,7 +296,7 @@ let ChatEditingOverlayController = class ChatEditingOverlayController {
             if (!response) {
                 return false;
             }
-            return observableFromEvent(this, response.onDidChange, () => !response.isComplete).read(r);
+            return observableFromEvent(this, response.onDidChange, () => !response.isComplete && !response.isPendingConfirmation).read(r);
         });
         this._store.add(autorun(r => {
             const data = sessionAndEntry.read(r);
@@ -314,7 +305,11 @@ let ChatEditingOverlayController = class ChatEditingOverlayController {
                 return;
             }
             const { session, entry } = data;
-            if (entry?.state.read(r) === WorkingSetEntryState.Modified
+            if (!session.isGlobalEditingSession && !inlineChatService.hideOnRequest.read(r)) {
+                hide();
+                return;
+            }
+            if (entry?.state.read(r) === ModifiedFileEntryState.Modified
                 || (!session.isGlobalEditingSession && isInProgress.read(r))
             ) {
                 const editorPane = group.activeEditorPane;

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

@@ -1,5 +1,5 @@
 import { IReference } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 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";
@@ -16,11 +16,10 @@ import { IUndoRedoElement } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 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 { IResolvedTextFileEditorModel } from "@codingame/monaco-vscode-4893679b-56e5-52c5-a8fb-c366cce9660f-common/vscode/vs/workbench/services/textfile/common/textfiles";
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { IModifiedFileEntry, ChatEditKind, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatEditKind, IModifiedFileEntry, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry } from "./chatEditingModifiedFileEntry.js";
 export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifiedFileEntry implements IModifiedFileEntry {
@@ -33,17 +32,16 @@ export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditin
     readonly initialContent: string;
     private readonly originalModel;
     private readonly modifiedModel;
-    readonly docFileEditorModel: IResolvedTextFileEditorModel;
+    private readonly _docFileEditorModel;
     private _edit;
     private _isEditFromUs;
     private _allEditsAreFromUs;
     private _diffOperation;
     private _diffOperationIds;
     private readonly _diffInfo;
-    readonly changesCount: IObservable<number>;
+    readonly changesCount: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;
     private readonly _editDecorationClear;
     private _editDecorations;
-    private readonly _diffTrimWhitespace;
     readonly originalURI: URI;
     constructor(resourceRef: IReference<IResolvedTextEditorModel>, _multiDiffEntryDelegate: {
         collapse: (transaction: ITransaction | undefined) => void;

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

@@ -21,6 +21,7 @@ import { OffsetEdits } from '@codingame/monaco-vscode-api/vscode/vs/editor/commo
 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 { TextModelChangeRecorder } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/model/changeRecorder';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
@@ -28,7 +29,6 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 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 { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
-import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
@@ -43,9 +43,9 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { SaveReason } 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 { stringToSnapshot } from '@codingame/monaco-vscode-4893679b-56e5-52c5-a8fb-c366cce9660f-common/vscode/vs/workbench/services/textfile/common/textfiles';
+import { stringToSnapshot, isTextFileEditorModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
-import { WorkingSetEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatEditingCodeEditorIntegration } from './chatEditingCodeEditorIntegration.js';
 import { AbstractChatEditingModifiedFileEntry, pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
@@ -92,7 +92,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             500
         )));
         this._editDecorations = [];
-        this.docFileEditorModel = this._register(resourceRef).object;
+        this._docFileEditorModel = this._register(resourceRef).object;
         this.modifiedModel = resourceRef.object.textEditorModel;
         this.originalURI = ChatEditingTextModelContentProvider.getFileURI(telemetryInfo.sessionId, this.entryId, this.modifiedURI.path);
         this.initialContent = initialContent ?? this.modifiedModel.getValue();
@@ -109,17 +109,13 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         this._register(toDisposable(() => {
             this._clearCurrentEditLineDecoration();
         }));
-        this._diffTrimWhitespace = observableConfigValue('diffEditor.ignoreTrimWhitespace', true, configService);
-        this._register(autorun(r => {
-            this._diffTrimWhitespace.read(r);
-            this._updateDiffInfoSeq();
-        }));
         const resourceFilter = this._register(( new MutableDisposable()));
         this._register(autorun(r => {
-            const res = this.isCurrentlyBeingModifiedBy.read(r);
-            if (res) {
-                const req = res.session.getRequests().find(value => value.id === res.requestId);
-                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(4684, "Chat Edits")));
+            const inProgress = this._lastModifyingResponseInProgressObs.read(r);
+            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(4748, "Chat Edits")));
             }
             else {
                 resourceFilter.clear();
@@ -190,13 +186,14 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
                 this._edit = e_ai.tryRebase(e_user_r);
             }
             this._allEditsAreFromUs = false;
+            this._userEditScheduler.schedule();
             this._updateDiffInfoSeq();
             const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
             const currentState = this._stateObs.get();
             switch (currentState) {
-                case WorkingSetEntryState.Modified:
+                case ModifiedFileEntryState.Modified:
                     if (didResetToOriginalContent) {
-                        this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+                        this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
                         break;
                     }
             }
@@ -204,7 +201,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(4685, "Chat Edit: '{0}'", request.message.text)) : ( localize(4686, "Chat Edit"));
+        const label = request?.message.text ? ( localize(4749, "Chat Edit: '{0}'", request.message.text)) : ( localize(4750, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {
@@ -228,7 +225,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, newDecorations);
         transaction((tx) => {
             if (!isLastEdits) {
-                this._stateObs.set(WorkingSetEntryState.Modified, tx);
+                this._stateObs.set(ModifiedFileEntryState.Modified, tx);
                 this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
                 const lineCount = this.modifiedModel.getLineCount();
                 this._rewriteRatioObs.set(Math.min(1, maxLineNumber / lineCount), tx);
@@ -240,6 +237,12 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
                 this._editDecorationClear.schedule();
             }
         });
+        if (isLastEdits) {
+            await this._textFileService.save(this.modifiedModel.uri, {
+                reason: SaveReason.AUTO,
+                skipSaveParticipants: true,
+            });
+        }
     }
     async _acceptHunk(change) {
         if (!this._diffInfo.get().changes.includes(change)) {
@@ -253,7 +256,8 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         this.originalModel.pushEditOperations(null, edits, _ => null);
         await this._updateDiffInfoSeq();
         if (this._diffInfo.get().identical) {
-            this._stateObs.set(WorkingSetEntryState.Accepted, undefined);
+            this._stateObs.set(ModifiedFileEntryState.Accepted, undefined);
+            this._notifyAction('accepted');
         }
         this._accessibilitySignalService.playSignal(AccessibilitySignal.editsKept, { allowManyInParallel: true });
         return true;
@@ -270,7 +274,8 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         this.modifiedModel.pushEditOperations(null, edits, _ => null);
         await this._updateDiffInfoSeq();
         if (this._diffInfo.get().identical) {
-            this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+            this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
+            this._notifyAction('rejected');
         }
         this._accessibilitySignalService.playSignal(AccessibilitySignal.editsUndone, { allowManyInParallel: true });
         return true;
@@ -279,9 +284,11 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         this._isEditFromUs = true;
         try {
             let result = [];
-            this.modifiedModel.pushEditOperations(null, edits, (undoEdits) => {
-                result = undoEdits;
-                return null;
+            TextModelChangeRecorder.editWithMetadata({ source: 'Chat.applyEdits' }, () => {
+                this.modifiedModel.pushEditOperations(null, edits, (undoEdits) => {
+                    result = undoEdits;
+                    return null;
+                });
             });
             return result;
         }
@@ -302,10 +309,17 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
             return undefined;
         }
+        if (this.state.get() !== ModifiedFileEntryState.Modified) {
+            this._diffInfo.set(nullDocumentDiff, undefined);
+            return nullDocumentDiff;
+        }
         const docVersionNow = this.modifiedModel.getVersionId();
         const snapshotVersionNow = this.originalModel.getVersionId();
-        const ignoreTrimWhitespace = this._diffTrimWhitespace.get();
-        const diff = await this._editorWorkerService.computeDiff(this.originalModel.uri, this.modifiedModel.uri, { ignoreTrimWhitespace, computeMoves: false, maxComputationTimeMs: 3000 }, 'advanced');
+        const diff = await this._editorWorkerService.computeDiff(this.originalModel.uri, this.modifiedModel.uri, {
+            ignoreTrimWhitespace: false,
+            computeMoves: false,
+            maxComputationTimeMs: 3000
+        }, 'advanced');
         if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
             return undefined;
         }
@@ -337,14 +351,16 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     }
     async _doReject(tx) {
         if (this.createdInRequestId === this._telemetryInfo.requestId) {
-            await this.docFileEditorModel.revert({ soft: true });
-            await this._fileService.del(this.modifiedURI);
+            if (isTextFileEditorModel(this._docFileEditorModel)) {
+                await this._docFileEditorModel.revert({ soft: true });
+                await this._fileService.del(this.modifiedURI);
+            }
             this._onDidDelete.fire();
         }
         else {
             this._setDocValue(this.originalModel.getValue());
-            if (this._allEditsAreFromUs) {
-                await this.docFileEditorModel.save({ reason: SaveReason.EXPLICIT, skipSaveParticipants: true });
+            if (this._allEditsAreFromUs && isTextFileEditorModel(this._docFileEditorModel)) {
+                await this._docFileEditorModel.save({ reason: SaveReason.EXPLICIT, skipSaveParticipants: true });
             }
             await this._collapse(tx);
         }
@@ -373,7 +389,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
                 undo: changes => this._rejectHunk(changes)
             };
         }));
-        return this._instantiationService.createInstance(ChatEditingCodeEditorIntegration, this, codeEditor, diffInfo);
+        return this._instantiationService.createInstance(ChatEditingCodeEditorIntegration, this, codeEditor, diffInfo, false);
     }
 };
 ChatEditingModifiedDocumentEntry = ChatEditingModifiedDocumentEntry_1 = ( __decorate([

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

@@ -1,3 +1,4 @@
+import { RunOnceScheduler } from "@codingame/monaco-vscode-api/vscode/vs/base/common/async";
 import { Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
@@ -12,9 +13,9 @@ import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 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 { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { IChatAgentResult } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { ChatEditKind, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatAgentResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { ChatEditKind, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 declare class AutoAcceptControl {
     readonly total: number;
@@ -36,10 +37,13 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     readonly entryId: string;
     protected readonly _onDidDelete: Emitter<void>;
     readonly onDidDelete: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
-    protected readonly _stateObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<WorkingSetEntryState, void>;
-    readonly state: IObservable<WorkingSetEntryState>;
+    protected readonly _stateObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<ModifiedFileEntryState, void>;
+    readonly state: IObservable<ModifiedFileEntryState>;
     protected readonly _isCurrentlyBeingModifiedByObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<IChatResponseModel | undefined, void>;
     readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined>;
+    protected readonly _lastModifyingResponseObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<IChatResponseModel | undefined, void>;
+    readonly lastModifyingResponse: IObservable<IChatResponseModel | undefined>;
+    protected readonly _lastModifyingResponseInProgressObs: IObservable<boolean | undefined>;
     protected readonly _rewriteRatioObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<number, void>;
     readonly rewriteRatio: IObservable<number>;
     private readonly _reviewModeTempObs;
@@ -52,6 +56,7 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     get lastModifyingRequestId(): string;
     private _refCounter;
     readonly abstract originalURI: URI;
+    protected readonly _userEditScheduler: RunOnceScheduler;
     constructor(modifiedURI: URI, _telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, configService: IConfigurationService, _fileConfigService: IFilesConfigurationService, _chatService: IChatService, _fileService: IFileService, _undoRedoService: IUndoRedoService, _instantiationService: IInstantiationService);
     dispose(): void;
     acquire(): this;
@@ -61,7 +66,7 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     protected abstract _doAccept(tx: ITransaction | undefined): Promise<void>;
     reject(tx: ITransaction | undefined): Promise<void>;
     protected abstract _doReject(tx: ITransaction | undefined): Promise<void>;
-    private _notifyAction;
+    protected _notifyAction(outcome: "accepted" | "rejected" | "userModified"): void;
     private readonly _editorIntegrations;
     getEditorIntegration(pane: IEditorPane): IModifiedFileEntryEditorIntegration;
     protected abstract _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
@@ -92,7 +97,7 @@ export interface ISnapshotEntry {
     readonly original: string;
     readonly current: string;
     readonly originalToCurrentEdit: OffsetEdit;
-    readonly state: WorkingSetEntryState;
+    readonly state: ModifiedFileEntryState;
     telemetryInfo: IModifiedEntryTelemetryInfo;
 }
 export {};