@codingame/monaco-vscode-chat-service-override 17.2.1 → 18.0.0

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

@@ -14,7 +14,7 @@ import { AccessibleDiffViewer } from '@codingame/monaco-vscode-api/vscode/vs/edi
 import { RenderOptions, LineSource, renderLines } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines';
 import { diffAddDecoration, diffWholeLineAddDecoration, diffDeleteDecoration } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/diffEditor/registrations.contribution';
 import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
-import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/lineRange';
+import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { Selection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection';
@@ -28,17 +28,18 @@ import { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vsco
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { TextEditorSelectionRevealType } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { EditorsOrder, isDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 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-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { isTextDiffEditorForEntry } from './chatEditing.js';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import { autorun, autorunWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import { constObservable, observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 
 var ChatEditingCodeEditorIntegration_1, DiffHunkWidget_1;
 registerCss(chatEditorController);
@@ -145,15 +146,15 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 this._accessibilitySignalsService.playSignal(AccessibilitySignal.diffLineModified, { source: 'chatEditingEditor.cursorPositionChanged' });
             }
         }));
-        this._store.add(autorunWithStore((r, store) => {
+        this._store.add(autorun(r => {
             const visible = this._accessibleDiffViewVisible.read(r);
             if (!visible || !enabledObs.read(r)) {
                 return;
             }
             const accessibleDiffWidget = ( new AccessibleDiffViewContainer());
             _editor.addOverlayWidget(accessibleDiffWidget);
-            store.add(toDisposable(() => _editor.removeOverlayWidget(accessibleDiffWidget)));
-            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(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)));
         }));
         let actualOptions;
         const restoreActualOptions = () => {
@@ -448,7 +449,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         const targetRange = decorations[newIndex];
         const targetPosition = next ? targetRange.getStartPosition() : targetRange.getEndPosition();
         this._editor.setPosition(targetPosition);
-        this._editor.revealPositionInCenter(targetPosition);
+        this._editor.revealPositionInCenter(targetRange.getStartPosition().delta(-1));
         this._editor.focus();
         return true;
     }
@@ -506,30 +507,15 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 options: { selection },
                 label: defaultAgentName
                     ? ( localize(
-                    4716,
+                    4758,
                     '{0} (changes from {1})',
                     basename(this._entry.modifiedURI),
                     defaultAgentName
                 ))
-                    : ( localize(4717, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                    : ( localize(4759, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
             });
             if (diffEditor && diffEditor.input) {
                 diffEditor.getControl()?.setSelection(selection);
-                const d = autorun(r => {
-                    const state = this._entry.state.read(r);
-                    if (state === ModifiedFileEntryState.Accepted || state === ModifiedFileEntryState.Rejected) {
-                        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)) {
-                                editorIdents.push(candidate);
-                            }
-                        }
-                        this._editorService.closeEditors(editorIdents);
-                    }
-                });
             }
         }
         else {

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

@@ -6,8 +6,8 @@ import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { observableFromEvent } 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 { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let ChatEditingEditorAccessibility = class ChatEditingEditorAccessibility {
     static { this.ID = 'chat.edits.accessibilty'; }

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

@@ -4,7 +4,7 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { Action2, MenuId, registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ctxReviewModeEnabled, ctxHasEditorModification, ctxIsGlobalEditingSession, ctxHasRequestInProgress } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
@@ -20,7 +20,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { EditorResourceAccessor, SideBySideEditor, TEXT_DIFF_EDITOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { NOTEBOOK_CELL_LIST_FOCUSED } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-c87fff3a-2aa9-52ab-ba4d-17e8d1e5e185-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
 class ChatEditingEditorAction extends Action2 {
     constructor(desc) {
@@ -54,8 +54,8 @@ class NavigateAction extends ChatEditingEditorAction {
                 ? 'chatEditor.action.navigateNext'
                 : 'chatEditor.action.navigatePrevious',
             title: next
-                ? ( localize2(4718, 'Go to Next Chat Edit'))
-                : ( localize2(4719, 'Go to Previous Chat Edit')),
+                ? ( localize2(4760, 'Go to Next Chat Edit'))
+                : ( localize2(4761, 'Go to Previous Chat Edit')),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -127,25 +127,25 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
         super({
             id,
             title: _keep
-                ? ( localize2(4720, 'Keep Chat Edits'))
-                : ( localize2(4721, 'Undo Chat Edits')),
+                ? ( localize2(4762, 'Keep Chat Edits'))
+                : ( localize2(4763, 'Undo Chat Edits')),
             shortTitle: _keep
-                ? ( localize2(4722, 'Keep'))
-                : ( localize2(4723, 'Undo')),
+                ? ( localize2(4764, 'Keep'))
+                : ( localize2(4765, 'Undo')),
             tooltip: _keep
-                ? ( localize2(4724, 'Keep Chat Edits in this File'))
-                : ( localize2(4725, 'Undo Chat Edits in this File')),
+                ? ( localize2(4766, 'Keep Chat Edits in this File'))
+                : ( localize2(4767, 'Undo Chat Edits in this File')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             icon: _keep
                 ? Codicon.check
                 : Codicon.discard,
             f1: true,
             keybinding: {
-                when: EditorContextKeys.focus,
-                weight: KeybindingWeight.WorkbenchContrib,
+                when: ( ContextKeyExpr.or(EditorContextKeys.focus, NOTEBOOK_EDITOR_FOCUSED)),
+                weight: KeybindingWeight.WorkbenchContrib + 10,
                 primary: _keep
-                    ? KeyMod.CtrlCmd | KeyCode.Enter
-                    : KeyMod.CtrlCmd | KeyCode.Backspace
+                    ? KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyY
+                    : KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyN,
             },
             menu: {
                 id: MenuId.ChatEditingEditorContent,
@@ -184,7 +184,7 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? 'chatEditor.action.acceptHunk' : 'chatEditor.action.undoHunk',
-            title: _accept ? ( localize2(4726, 'Keep this Change')) : ( localize2(4727, 'Undo this Change')),
+            title: _accept ? ( localize2(4768, 'Keep this Change')) : ( localize2(4769, 'Undo this Change')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             icon: _accept ? Codicon.check : Codicon.discard,
             f1: true,
@@ -192,8 +192,8 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
                 when: ( ContextKeyExpr.or(EditorContextKeys.focus, NOTEBOOK_CELL_LIST_FOCUSED)),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
                 primary: _accept
-                    ? KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter
-                    : KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Backspace
+                    ? KeyMod.CtrlCmd | KeyCode.KeyY
+                    : KeyMod.CtrlCmd | KeyCode.KeyN
             },
             menu: {
                 id: MenuId.ChatEditingEditorHunk,
@@ -215,7 +215,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.toggleDiff',
-            title: ( localize2(4728, 'Toggle Diff Editor for Chat Edits')),
+            title: ( localize2(4770, 'Toggle Diff Editor for Chat Edits')),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -247,7 +247,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.showAccessibleDiffView',
-            title: ( localize2(4729, 'Show Accessible Diff View for Chat Edits')),
+            title: ( localize2(4771, 'Show Accessible Diff View for Chat Edits')),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             keybinding: {
@@ -265,7 +265,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.reviewChanges',
-            title: ( localize2(4730, "Review")),
+            title: ( localize2(4772, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             menu: [{
                     id: MenuId.ChatEditingEditorContent,
@@ -283,7 +283,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? 'chatEditing.multidiff.acceptAllFiles' : 'chatEditing.multidiff.discardAllFiles',
-            title: accept ? ( localize(4731, 'Keep All Edits')) : ( localize(4732, 'Undo All Edits')),
+            title: accept ? ( localize(4773, 'Keep All Edits')) : ( localize(4774, 'Undo All Edits')),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -344,7 +344,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(4733, "Navigation Status")),
+            title: ( localize(4775, "Navigation Status")),
             precondition: ( ContextKeyExpr.false()),
         },
         group: 'navigate',

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

@@ -29,17 +29,21 @@ import { renderIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 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';
+import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
+import { observableFromEventOpts, observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
+import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
 registerCss(chatEditingEditorOverlay);
 let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
-    constructor(_editor, _chatService, _instaService) {
+    constructor(_editor, _chatService, _keybindingService, _instaService) {
         super();
         this._editor = _editor;
         this._chatService = _chatService;
+        this._keybindingService = _keybindingService;
         this._instaService = _instaService;
         this._showStore = this._store.add(( new DisposableStore()));
         this._session = observableValue(this, undefined);
@@ -48,14 +52,9 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
         this._domNode = document.createElement('div');
         this._domNode.classList.add('chat-editor-overlay-widget');
         this._isBusy = derived(r => {
+            const entry = this._entry.read(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;
+            return entry?.waitsForLastEdits.read(r) ?? !session?.isGlobalEditingSession;
         });
         const requestMessage = derived(r => {
             const session = this._session.read(r);
@@ -65,10 +64,10 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
             }
             const response = this._entry.read(r)?.lastModifyingResponse.read(r);
             if (!response) {
-                return { message: ( localize(4739, "Working...")) };
+                return { message: ( localize(4781, "Working...")) };
             }
             if (response.isPaused.read(r)) {
-                return { message: ( localize(4740, "Paused")), paused: true };
+                return { message: ( localize(4782, "Paused")), paused: true };
             }
             const lastPart = observableFromEventOpts({ equalsFn: equals }, response.onDidChange, () => response.response.value)
                 .read(r)
@@ -81,7 +80,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                 return { message: lastPart.content };
             }
             else {
-                return { message: ( localize(4739, "Working...")) };
+                return { message: ( localize(4781, "Working...")) };
             }
         });
         const progressNode = document.createElement('div');
@@ -158,10 +157,10 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                 const { changeCount, activeIdx } = that._navigationBearings.read(r);
                                 if (changeCount > 0) {
                                     const n = activeIdx === -1 ? '1' : `${activeIdx + 1}`;
-                                    this.label.innerText = ( localize(4741, "{0} of {1}", n, changeCount));
+                                    this.label.innerText = ( localize(4783, "{0} of {1}", n, changeCount));
                                 }
                                 else {
-                                    this.label.innerText = ( localize(4742, "—"));
+                                    this.label.innerText = ( localize(4784, "—"));
                                 }
                                 this.updateTooltip();
                             }));
@@ -173,21 +172,21 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             }
                             let result;
                             if (changeCount === 1 && entriesCount === 1) {
-                                result = ( localize(4743, "1 change in 1 file"));
+                                result = ( localize(4785, "1 change in 1 file"));
                             }
                             else if (changeCount === 1) {
-                                result = ( localize(4744, "1 change in {0} files", entriesCount));
+                                result = ( localize(4786, "1 change in {0} files", entriesCount));
                             }
                             else if (entriesCount === 1) {
-                                result = ( localize(4745, "{0} changes in 1 file", changeCount));
+                                result = ( localize(4787, "{0} changes in 1 file", changeCount));
                             }
                             else {
-                                result = ( localize(4746, "{0} changes in {1} files", changeCount, entriesCount));
+                                result = ( localize(4788, "{0} changes in {1} files", changeCount, entriesCount));
                             }
                             if (!that._isBusy.get()) {
                                 return result;
                             }
-                            return localize(4747, "{0} - Working...", result);
+                            return localize(4789, "{0} - Working...", result);
                         }
                     });
                 }
@@ -227,6 +226,17 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                         get actionRunner() {
                             return super.actionRunner;
                         }
+                        getTooltip() {
+                            const value = super.getTooltip();
+                            if (!value) {
+                                return value;
+                            }
+                            const kb = that._keybindingService.lookupKeybinding(this.action.id);
+                            if (!kb) {
+                                return value;
+                            }
+                            return localize(4790, "{0} ({1})", value, kb.getLabel());
+                        }
                     });
                 }
                 return undefined;
@@ -244,7 +254,8 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
 };
 ChatEditorOverlayWidget = ( __decorate([
     ( __param(1, IChatService)),
-    ( __param(2, IInstantiationService))
+    ( __param(2, IKeybindingService)),
+    ( __param(3, IInstantiationService))
 ], ChatEditorOverlayWidget));
 let ChatEditingOverlayController = class ChatEditingOverlayController {
     constructor(container, group, instaService, chatService, chatEditingService, inlineChatService) {
@@ -291,12 +302,7 @@ let ChatEditingOverlayController = class ChatEditingOverlayController {
                 return false;
             }
             const chatModel = chatService.getSession(session.chatSessionId);
-            const lastResponse = observableFromEvent(this, chatModel.onDidChange, () => chatModel.getRequests().at(-1)?.response);
-            const response = lastResponse.read(r);
-            if (!response) {
-                return false;
-            }
-            return observableFromEvent(this, response.onDidChange, () => !response.isComplete && !response.isPendingConfirmation).read(r);
+            return chatModel.requestInProgressObs.read(r);
         });
         this._store.add(autorun(r => {
             const data = sessionAndEntry.read(r);

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

@@ -29,6 +29,7 @@ export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditin
     private readonly _accessibilitySignalService;
     private static readonly _lastEditDecorationOptions;
     private static readonly _pendingEditDecorationOptions;
+    private static readonly _atomicEditDecorationOptions;
     readonly initialContent: string;
     private readonly originalModel;
     private readonly modifiedModel;

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

@@ -1,7 +1,8 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { addDisposableListener, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
-import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { RunOnceScheduler, DeferredPromise, timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { toDisposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -9,7 +10,7 @@ import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/co
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
-import { OffsetEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/offsetEdit';
+import { StringEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/stringEdit';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
 import { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
@@ -17,11 +18,11 @@ import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { SingleModelEditStackElement } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/editStack';
 import { ModelDecorationOptions, createTextBufferFactoryFromSnapshot } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
-import { OffsetEdits } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModelOffsetEdit';
+import { offsetEditFromContentChanges, offsetEditToEditOperations, offsetEditFromLineRangeMapping } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModelStringEdit';
 import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
 import { 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 { TextModelEditReason } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditReason';
 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';
@@ -50,8 +51,9 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { ChatEditingCodeEditorIntegration } from './chatEditingCodeEditorIntegration.js';
 import { AbstractChatEditingModifiedFileEntry, pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
-import { observableValue, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
 var ChatEditingModifiedDocumentEntry_1;
 let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifiedFileEntry {
@@ -75,13 +77,22 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             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)
+        }
+    }); }
     constructor(resourceRef, _multiDiffEntryDelegate, telemetryInfo, kind, initialContent, markerService, modelService, textModelService, languageService, configService, fileConfigService, chatService, _editorWorkerService, _textFileService, fileService, undoRedoService, instantiationService, _accessibilitySignalService) {
         super(resourceRef.object.textEditorModel.uri, telemetryInfo, kind, configService, fileConfigService, chatService, fileService, undoRedoService, instantiationService);
         this._multiDiffEntryDelegate = _multiDiffEntryDelegate;
         this._editorWorkerService = _editorWorkerService;
         this._textFileService = _textFileService;
         this._accessibilitySignalService = _accessibilitySignalService;
-        this._edit = OffsetEdit.empty;
+        this._edit = StringEdit.empty;
         this._isEditFromUs = false;
         this._allEditsAreFromUs = true;
         this._diffOperationIds = 0;
@@ -111,11 +122,11 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         }));
         const resourceFilter = this._register(( new MutableDisposable()));
         this._register(autorun(r => {
-            const inProgress = this._lastModifyingResponseInProgressObs.read(r);
+            const inProgress = this._waitsForLastEdits.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")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(4791, "Chat Edits")));
             }
             else {
                 resourceFilter.clear();
@@ -167,7 +178,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         this._clearCurrentEditLineDecoration();
     }
     _mirrorEdits(event) {
-        const edit = OffsetEdits.fromContentChanges(event.changes);
+        const edit = offsetEditFromContentChanges(event.changes);
         if (this._isEditFromUs) {
             const e_sum = this._edit;
             const e_ai = edit;
@@ -181,7 +192,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
                 this._edit = e_ai.compose(e_user);
             }
             else {
-                const edits = OffsetEdits.asEditOperations(e_user_r, this.originalModel);
+                const edits = offsetEditToEditOperations(e_user_r, this.originalModel);
                 this.originalModel.applyEdits(edits);
                 this._edit = e_ai.tryRebase(e_user_r);
             }
@@ -201,34 +212,71 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(4749, "Chat Edit: '{0}'", request.message.text)) : ( localize(4750, "Chat Edit"));
+        const label = request?.message.text ? ( localize(4792, "Chat Edit: '{0}'", request.message.text)) : ( localize(4793, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {
         assertType(textEdits.every(TextEdit.isTextEdit), 'INVALID args, can only handle text edits');
         assert(isEqual(resource, this.modifiedURI), ' INVALID args, can only edit THIS document');
-        const ops = ( textEdits.map(TextEdit.asEditOperation));
-        const undoEdits = this._applyEdits(ops);
-        const maxLineNumber = undoEdits.reduce((max, op) => Math.max(max, op.range.startLineNumber), 0);
-        const newDecorations = [
-            {
-                options: ChatEditingModifiedDocumentEntry_1._pendingEditDecorationOptions,
-                range: ( new Range(maxLineNumber + 1, 1, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER))
+        const isAtomicEdits = textEdits.length > 0 && isLastEdits;
+        let rewriteRatio = 0;
+        if (isAtomicEdits) {
+            const minimalEdits = (await this._editorWorkerService.computeMoreMinimalEdits(this.modifiedModel.uri, textEdits)) ?? textEdits;
+            const ops = ( minimalEdits.map(TextEdit.asEditOperation));
+            const undoEdits = this._applyEdits(ops);
+            if (undoEdits.length > 0) {
+                let range;
+                for (let i = 0; i < undoEdits.length; i++) {
+                    const op = undoEdits[i];
+                    if (!range) {
+                        range = Range.lift(op.range);
+                    }
+                    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') {
+                            defer.complete();
+                            listener.dispose();
+                        }
+                    });
+                    this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, [{
+                            options: ChatEditingModifiedDocumentEntry_1._atomicEditDecorationOptions,
+                            range
+                        }]);
+                    await Promise.any([defer.p, timeout(500)]);
+                    listener.dispose();
+                }
             }
-        ];
-        if (maxLineNumber > 0) {
-            newDecorations.push({
-                options: ChatEditingModifiedDocumentEntry_1._lastEditDecorationOptions,
-                range: ( new Range(maxLineNumber, 1, maxLineNumber, Number.MAX_SAFE_INTEGER))
-            });
         }
-        this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, newDecorations);
+        else {
+            const ops = ( textEdits.map(TextEdit.asEditOperation));
+            const undoEdits = this._applyEdits(ops);
+            const maxLineNumber = undoEdits.reduce((max, op) => Math.max(max, op.range.startLineNumber), 0);
+            rewriteRatio = Math.min(1, maxLineNumber / this.modifiedModel.getLineCount());
+            const newDecorations = [
+                {
+                    options: ChatEditingModifiedDocumentEntry_1._pendingEditDecorationOptions,
+                    range: ( new Range(maxLineNumber + 1, 1, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER))
+                }
+            ];
+            if (maxLineNumber > 0) {
+                newDecorations.push({
+                    options: ChatEditingModifiedDocumentEntry_1._lastEditDecorationOptions,
+                    range: ( new Range(maxLineNumber, 1, maxLineNumber, Number.MAX_SAFE_INTEGER))
+                });
+            }
+            this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, newDecorations);
+        }
         transaction((tx) => {
+            this._waitsForLastEdits.set(!isLastEdits, tx);
+            this._stateObs.set(ModifiedFileEntryState.Modified, tx);
             if (!isLastEdits) {
-                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);
+                this._rewriteRatioObs.set(rewriteRatio, tx);
             }
             else {
                 this._resetEditsState(tx);
@@ -284,7 +332,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         this._isEditFromUs = true;
         try {
             let result = [];
-            TextModelChangeRecorder.editWithMetadata({ source: 'Chat.applyEdits' }, () => {
+            TextModelEditReason.editWithReason(( new TextModelEditReason({ source: 'Chat.applyEdits' })), () => {
                 this.modifiedModel.pushEditOperations(null, edits, (undoEdits) => {
                     result = undoEdits;
                     return null;
@@ -326,7 +374,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         if (this.modifiedModel.getVersionId() === docVersionNow && this.originalModel.getVersionId() === snapshotVersionNow) {
             const diff2 = diff ?? nullDocumentDiff;
             this._diffInfo.set(diff2, undefined);
-            this._edit = OffsetEdits.fromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
+            this._edit = offsetEditFromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
             return diff2;
         }
         return undefined;
@@ -334,7 +382,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     async _doAccept(tx) {
         this.originalModel.setValue(this.modifiedModel.createSnapshot());
         this._diffInfo.set(nullDocumentDiff, tx);
-        this._edit = OffsetEdit.empty;
+        this._edit = StringEdit.empty;
         await this._collapse(tx);
         const config = this._fileConfigService.getAutoSaveConfiguration(this.modifiedURI);
         if (!config.autoSave || !this._textFileService.isDirty(this.modifiedURI)) {