@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -30,11 +30,13 @@ import { TextEditorSelectionRevealType } from '@codingame/monaco-vscode-api/vsco
 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 { 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 { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isTextDiffEditorForEntry } from './chatEditing.js';
+import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
+import { AcceptHunkAction, RejectHunkAction } from './chatEditingEditorActions.js';
+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 { 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';
@@ -46,10 +48,9 @@ registerCss(chatEditorController);
 let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
     static { ChatEditingCodeEditorIntegration_1 = this; }
     static { this._diffLineDecorationData = ModelDecorationOptions.register({ description: 'diff-line-decoration' }); }
-    constructor(_entry, _editor, documentDiffInfo, renderDiffImmediately, _chatAgentService, _editorService, _accessibilitySignalsService, instantiationService) {
+    constructor(_entry, _editor, documentDiffInfo, renderDiffImmediately, _editorService, _accessibilitySignalsService, contextKeyService, instantiationService) {
         this._entry = _entry;
         this._editor = _editor;
-        this._chatAgentService = _chatAgentService;
         this._editorService = _editorService;
         this._accessibilitySignalsService = _accessibilitySignalsService;
         this._currentIndex = observableValue(this, -1);
@@ -129,21 +130,28 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 this._updateDiffRendering(diff, reviewMode, isDiffEditor);
             }
         }));
+        const _ctxCursorInChangeRange = ctxCursorInChangeRange.bindTo(contextKeyService);
         this._store.add(autorun(r => {
             const position = codeEditorObs.positions.read(r)?.at(0);
             if (!position || !enabledObs.read(r)) {
+                _ctxCursorInChangeRange.reset();
                 return;
             }
             const diff = documentDiffInfo.read(r);
-            const mapping = diff.changes.find(m => m.modified.contains(position.lineNumber) || m.modified.isEmpty && m.modified.startLineNumber === position.lineNumber);
-            if (mapping?.modified.isEmpty) {
-                this._accessibilitySignalsService.playSignal(AccessibilitySignal.diffLineDeleted, { source: 'chatEditingEditor.cursorPositionChanged' });
-            }
-            else if (mapping?.original.isEmpty) {
-                this._accessibilitySignalsService.playSignal(AccessibilitySignal.diffLineInserted, { source: 'chatEditingEditor.cursorPositionChanged' });
-            }
-            else if (mapping) {
-                this._accessibilitySignalsService.playSignal(AccessibilitySignal.diffLineModified, { source: 'chatEditingEditor.cursorPositionChanged' });
+            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) {
+                    signal = AccessibilitySignal.diffLineInserted;
+                }
+                else {
+                    signal = AccessibilitySignal.diffLineModified;
+                }
+                this._accessibilitySignalsService.playSignal(signal, { source: 'chatEditingEditor.cursorPositionChanged' });
             }
         }));
         this._store.add(autorun(r => {
@@ -359,6 +367,16 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
             const widget = this._diffHunkWidgets[idx];
             toggleWidget(widget);
         }));
+        this._diffHunksRenderStore.add(this._editor.onMouseUp(e => {
+            if (e.target.type === MouseTargetType.CONTENT_VIEW_ZONE) {
+                const zone = e.target.detail;
+                const idx = this._viewZones.findIndex(id => id === zone.viewZoneId);
+                if (idx >= 0) {
+                    this._editor.setPosition(e.target.position);
+                    this._editor.focus();
+                }
+            }
+        }));
         this._diffHunksRenderStore.add(this._editor.onMouseMove(e => {
             if (e.target.type === MouseTargetType.OVERLAY_WIDGET) {
                 const id = e.target.detail;
@@ -500,19 +518,11 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         }
         const isDiffEditor = this._editor.getOption(EditorOption.inDiffEditor);
         if (show !== undefined ? show : !isDiffEditor) {
-            const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Chat)?.fullName;
             const diffEditor = await this._editorService.openEditor({
                 original: { resource: this._entry.originalURI },
                 modified: { resource: this._entry.modifiedURI },
                 options: { selection },
-                label: defaultAgentName
-                    ? ( localize(
-                    5063,
-                    '{0} (changes from {1})',
-                    basename(this._entry.modifiedURI),
-                    defaultAgentName
-                ))
-                    : ( localize(5064, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                label: ( localize(5138, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
             });
             if (diffEditor && diffEditor.input) {
                 diffEditor.getControl()?.setSelection(selection);
@@ -545,9 +555,9 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
     }
 };
 ChatEditingCodeEditorIntegration = ChatEditingCodeEditorIntegration_1 = ( __decorate([
-    ( __param(4, IChatAgentService)),
-    ( __param(5, IEditorService)),
-    ( __param(6, IAccessibilitySignalService)),
+    ( __param(4, IEditorService)),
+    ( __param(5, IAccessibilitySignalService)),
+    ( __param(6, IContextKeyService)),
     ( __param(7, IInstantiationService))
 ], ChatEditingCodeEditorIntegration));
 let DiffHunkWidget = class DiffHunkWidget {
@@ -571,6 +581,16 @@ let DiffHunkWidget = class DiffHunkWidget {
                 renderShortTitle: true,
                 arg: this,
             },
+            actionViewItemProvider: (action, options) => {
+                if (action.id === AcceptHunkAction.ID || action.id === RejectHunkAction.ID) {
+                    return new (class extends ActionViewItem {
+                        constructor() {
+                            super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true, icon: false, label: true });
+                        }
+                    });
+                }
+                return undefined;
+            }
         });
         this._store.add(toolbar);
         this._store.add(toolbar.actionRunner.onWillRun(_ => _editor.focus()));

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

@@ -3,8 +3,8 @@ import { Action2, IAction2Options } from "@codingame/monaco-vscode-api/vscode/vs
 import { IChatEditingSession, IModifiedFileEntry, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
 declare abstract class ChatEditingEditorAction extends Action2 {
     constructor(desc: Readonly<IAction2Options>);
-    run(accessor: ServicesAccessor, ...args: any[]): Promise<void>;
-    abstract runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditingSession, entry: IModifiedFileEntry, integration: IModifiedFileEntryEditorIntegration, ...args: any[]): Promise<void> | void;
+    run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
+    abstract runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditingSession, entry: IModifiedFileEntry, integration: IModifiedFileEntryEditorIntegration, ...args: unknown[]): Promise<void> | void;
 }
 declare abstract class KeepOrUndoAction extends ChatEditingEditorAction {
     private _keep;
@@ -19,14 +19,27 @@ export declare class RejectAction extends KeepOrUndoAction {
     static readonly ID = "chatEditor.action.reject";
     constructor();
 }
+declare abstract class AcceptRejectHunkAction extends ChatEditingEditorAction {
+    private readonly _accept;
+    constructor(_accept: boolean);
+    runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditingSession, entry: IModifiedFileEntry, ctrl: IModifiedFileEntryEditorIntegration, ...args: unknown[]): Promise<void>;
+}
+export declare class AcceptHunkAction extends AcceptRejectHunkAction {
+    static readonly ID = "chatEditor.action.acceptHunk";
+    constructor();
+}
+export declare class RejectHunkAction extends AcceptRejectHunkAction {
+    static readonly ID = "chatEditor.action.undoHunk";
+    constructor();
+}
 export declare class ReviewChangesAction extends ChatEditingEditorAction {
     constructor();
-    runChatEditingCommand(_accessor: ServicesAccessor, _session: IChatEditingSession, entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration, ..._args: any[]): void;
+    runChatEditingCommand(_accessor: ServicesAccessor, _session: IChatEditingSession, entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration, ..._args: unknown[]): void;
 }
 export declare class AcceptAllEditsAction extends ChatEditingEditorAction {
     static readonly ID = "chatEditor.action.acceptAllEdits";
     constructor();
-    runChatEditingCommand(_accessor: ServicesAccessor, session: IChatEditingSession, _entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration, ..._args: any[]): Promise<void>;
+    runChatEditingCommand(_accessor: ServicesAccessor, session: IChatEditingSession, _entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration, ..._args: unknown[]): Promise<void>;
 }
 export declare function registerChatEditorActions(): void;
 export declare const navigationBearingFakeActionId = "chatEditor.navigation.bearings";

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

@@ -8,19 +8,20 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
-import { resolveCommandsContext } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-a6a3e03d-2b1a-5e17-b904-ed5d40c14550-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 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 { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { MultiDiffEditorInput } from '@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME } 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 { CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ctxReviewModeEnabled, ctxHasEditorModification, ctxIsGlobalEditingSession, ctxIsCurrentlyBeingModified } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ctxReviewModeEnabled, ctxHasEditorModification, ctxIsGlobalEditingSession, ctxIsCurrentlyBeingModified, ctxCursorInChangeRange } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
 
 class ChatEditingEditorAction extends Action2 {
     constructor(desc) {
@@ -54,8 +55,8 @@ class NavigateAction extends ChatEditingEditorAction {
                 ? 'chatEditor.action.navigateNext'
                 : 'chatEditor.action.navigatePrevious',
             title: next
-                ? ( localize2(5065, 'Go to Next Chat Edit'))
-                : ( localize2(5066, 'Go to Previous Chat Edit')),
+                ? ( localize2(5139, 'Go to Next Chat Edit'))
+                : ( localize2(5140, 'Go to Previous Chat Edit')),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -127,15 +128,15 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
         super({
             id,
             title: _keep
-                ? ( localize2(5067, 'Keep Chat Edits'))
-                : ( localize2(5068, 'Undo Chat Edits')),
+                ? ( localize2(5141, 'Keep Chat Edits'))
+                : ( localize2(5142, 'Undo Chat Edits')),
             shortTitle: _keep
-                ? ( localize2(5069, 'Keep'))
-                : ( localize2(5070, 'Undo')),
+                ? ( localize2(5143, 'Keep'))
+                : ( localize2(5144, 'Undo')),
             tooltip: _keep
-                ? ( localize2(5071, 'Keep Chat Edits in this File'))
-                : ( localize2(5072, 'Undo Chat Edits in this File')),
-            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
+                ? ( localize2(5145, 'Keep Chat Edits in this File'))
+                : ( localize2(5146, 'Undo Chat Edits in this File')),
+            precondition: ( ContextKeyExpr.and(ctxIsGlobalEditingSession, ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: _keep
                 ? Codicon.check
                 : Codicon.discard,
@@ -151,8 +152,7 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
                 id: MenuId.ChatEditingEditorContent,
                 group: 'a_resolve',
                 order: _keep ? 0 : 1,
-                when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ( ctxIsCurrentlyBeingModified.negate()))), (
-                ContextKeyExpr.and(ctxIsGlobalEditingSession, !_keep ? ctxReviewModeEnabled : undefined))))
+                when: !_keep ? ctxReviewModeEnabled : undefined
             }
         });
         this._keep = _keep;
@@ -180,16 +180,18 @@ class RejectAction extends KeepOrUndoAction {
         super(RejectAction.ID, false);
     }
 }
+const acceptHunkId = 'chatEditor.action.acceptHunk';
+const undoHunkId = 'chatEditor.action.undoHunk';
 class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
-            id: _accept ? 'chatEditor.action.acceptHunk' : 'chatEditor.action.undoHunk',
-            title: _accept ? ( localize2(5073, 'Keep this Change')) : ( localize2(5074, 'Undo this Change')),
+            id: _accept ? acceptHunkId : undoHunkId,
+            title: _accept ? ( localize2(5147, 'Keep this Change')) : ( localize2(5148, 'Undo this Change')),
+            shortTitle: _accept ? ( localize2(5149, 'Keep')) : ( localize2(5150, 'Undo')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
-            icon: _accept ? Codicon.check : Codicon.discard,
             f1: true,
             keybinding: {
-                when: ( ContextKeyExpr.or(EditorContextKeys.focus, NOTEBOOK_CELL_LIST_FOCUSED)),
+                when: ( ContextKeyExpr.and(ctxCursorInChangeRange, ( ContextKeyExpr.or(EditorContextKeys.focus, NOTEBOOK_CELL_LIST_FOCUSED)))),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
                 primary: _accept
                     ? KeyMod.CtrlCmd | KeyCode.KeyY
@@ -215,11 +217,23 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
         }
     }
 }
+class AcceptHunkAction extends AcceptRejectHunkAction {
+    static { this.ID = acceptHunkId; }
+    constructor() {
+        super(true);
+    }
+}
+class RejectHunkAction extends AcceptRejectHunkAction {
+    static { this.ID = undoHunkId; }
+    constructor() {
+        super(false);
+    }
+}
 class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.toggleDiff',
-            title: ( localize2(5075, 'Toggle Diff Editor for Chat Edits')),
+            title: ( localize2(5151, 'Toggle Diff Editor for Chat Edits')),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -251,7 +265,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.showAccessibleDiffView',
-            title: ( localize2(5076, 'Show Accessible Diff View for Chat Edits')),
+            title: ( localize2(5152, 'Show Accessible Diff View for Chat Edits')),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             keybinding: {
@@ -269,7 +283,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.reviewChanges',
-            title: ( localize2(5077, "Review")),
+            title: ( localize2(5153, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             menu: [{
                     id: MenuId.ChatEditingEditorContent,
@@ -288,8 +302,8 @@ class AcceptAllEditsAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: AcceptAllEditsAction.ID,
-            title: ( localize2(5078, 'Keep All Chat Edits')),
-            tooltip: ( localize2(5079, 'Keep All Chat Edits in this Session')),
+            title: ( localize2(5154, 'Keep All Chat Edits')),
+            tooltip: ( localize2(5155, 'Keep All Chat Edits in this Session')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: Codicon.checkAll,
             f1: true,
@@ -308,7 +322,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? 'chatEditing.multidiff.acceptAllFiles' : 'chatEditing.multidiff.discardAllFiles',
-            title: accept ? ( localize(5080, 'Keep All Edits')) : ( localize(5081, 'Undo All Edits')),
+            title: accept ? ( localize(5156, 'Keep All Edits')) : ( localize(5157, 'Undo All Edits')),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -333,7 +347,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
         if (!(editor instanceof MultiDiffEditorInput) || !editor.resource) {
             return;
         }
-        const session = chatEditingService.getEditingSession(editor.resource.authority);
+        const session = chatEditingService.getEditingSession(LocalChatSessionUri.forSession(editor.resource.authority));
         if (this.accept) {
             await session?.accept();
         }
@@ -353,12 +367,8 @@ function registerChatEditorActions() {
     registerAction2(AcceptAction);
     registerAction2(RejectAction);
     registerAction2(AcceptAllEditsAction);
-    registerAction2(class AcceptHunkAction extends AcceptRejectHunkAction {
-        constructor() { super(true); }
-    });
-    registerAction2(class RejectHunkAction extends AcceptRejectHunkAction {
-        constructor() { super(false); }
-    });
+    registerAction2(AcceptHunkAction);
+    registerAction2(RejectHunkAction);
     registerAction2(ToggleDiffAction);
     registerAction2(ToggleAccessibleDiffViewAction);
     registerAction2(class extends MultiDiffAcceptDiscardAction {
@@ -370,7 +380,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(5082, "Navigation Status")),
+            title: ( localize(5158, "Navigation Status")),
             precondition: ( ContextKeyExpr.false()),
         },
         group: 'navigate',
@@ -380,4 +390,4 @@ function registerChatEditorActions() {
 }
 const navigationBearingFakeActionId = 'chatEditor.navigation.bearings';
 
-export { AcceptAction, AcceptAllEditsAction, RejectAction, ReviewChangesAction, navigationBearingFakeActionId, registerChatEditorActions };
+export { AcceptAction, AcceptAllEditsAction, AcceptHunkAction, RejectAction, RejectHunkAction, ReviewChangesAction, navigationBearingFakeActionId, registerChatEditorActions };

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

@@ -16,7 +16,7 @@ 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-615ce609-8555-545a-a549-47bd9f80e9f8-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
+import { EditorGroupView } from '@codingame/monaco-vscode-09f99a3e-bf90-51d4-ab34-acea412359d2-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';
@@ -58,13 +58,13 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
         });
         const requestMessage = derived(r => {
             const session = this._session.read(r);
-            const chatModel = this._chatService.getSession(session?.chatSessionId ?? '');
+            const chatModel = session?.chatSessionResource && this._chatService.getSession(session?.chatSessionResource);
             if (!session || !chatModel) {
                 return undefined;
             }
             const response = this._entry.read(r)?.lastModifyingResponse.read(r);
             if (!response) {
-                return { message: ( localize(5089, "Working...")) };
+                return { message: ( localize(5166, "Working...")) };
             }
             const lastPart = observableFromEventOpts({ equalsFn: equals }, response.onDidChange, () => response.response.value)
                 .read(r)
@@ -77,7 +77,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                 return { message: lastPart.content };
             }
             else {
-                return { message: ( localize(5089, "Working...")) };
+                return { message: ( localize(5166, "Working...")) };
             }
         });
         const progressNode = createElement('div');
@@ -154,10 +154,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(5090, "{0} of {1}", n, changeCount));
+                                    this.label.innerText = ( localize(5167, "{0} of {1}", n, changeCount));
                                 }
                                 else {
-                                    this.label.innerText = ( localize(5091, "—"));
+                                    this.label.innerText = ( localize(5168, "—"));
                                 }
                                 this.updateTooltip();
                             }));
@@ -169,21 +169,21 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             }
                             let result;
                             if (changeCount === 1 && entriesCount === 1) {
-                                result = ( localize(5092, "1 change in 1 file"));
+                                result = ( localize(5169, "1 change in 1 file"));
                             }
                             else if (changeCount === 1) {
-                                result = ( localize(5093, "1 change in {0} files", entriesCount));
+                                result = ( localize(5170, "1 change in {0} files", entriesCount));
                             }
                             else if (entriesCount === 1) {
-                                result = ( localize(5094, "{0} changes in 1 file", changeCount));
+                                result = ( localize(5171, "{0} changes in 1 file", changeCount));
                             }
                             else {
-                                result = ( localize(5095, "{0} changes in {1} files", changeCount, entriesCount));
+                                result = ( localize(5172, "{0} changes in {1} files", changeCount, entriesCount));
                             }
                             if (!that._isBusy.get()) {
                                 return result;
                             }
-                            return localize(5096, "{0} - Working...", result);
+                            return localize(5173, "{0} - Working...", result);
                         }
                     });
                 }
@@ -232,7 +232,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             if (!kb) {
                                 return value;
                             }
-                            return localize(5097, "{0} ({1})", value, kb.getLabel());
+                            return localize(5174, "{0} ({1})", value, kb.getLabel());
                         }
                     });
                 }
@@ -298,7 +298,7 @@ let ChatEditingOverlayController = class ChatEditingOverlayController {
             if (!session) {
                 return false;
             }
-            const chatModel = chatService.getSession(session.chatSessionId);
+            const chatModel = chatService.getSession(session.chatSessionResource);
             return chatModel.requestInProgressObs.read(r);
         });
         this._store.add(autorun(r => {
@@ -308,7 +308,7 @@ let ChatEditingOverlayController = class ChatEditingOverlayController {
                 return;
             }
             const { session, entry } = data;
-            if (!session.isGlobalEditingSession && !inlineChatService.hideOnRequest.read(r)) {
+            if (!session.isGlobalEditingSession) {
                 hide();
                 return;
             }

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

@@ -3,6 +3,8 @@ import { ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Location, 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 { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+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 { IResolvedTextEditorModel } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
@@ -18,35 +20,52 @@ import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workben
 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 { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
+interface IMultiDiffEntryDelegate {
+    collapse: (transaction: ITransaction | undefined) => void;
+}
 export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifiedFileEntry implements IModifiedFileEntry {
     private readonly _multiDiffEntryDelegate;
     private readonly _textFileService;
+    private readonly _editorWorkerService;
     readonly initialContent: string;
     private readonly originalModel;
     private readonly modifiedModel;
     private readonly _docFileEditorModel;
     get changesCount(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;
+    get diffInfo(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<{
+        originalModel: ITextModel;
+        modifiedModel: ITextModel;
+        keep: (changes: import("@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping").DetailedLineRangeMapping) => Promise<boolean>;
+        undo: (changes: import("@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping").DetailedLineRangeMapping) => Promise<boolean>;
+        identical: boolean;
+        quitEarly: boolean;
+        changes: readonly import("@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping").DetailedLineRangeMapping[];
+        moves: readonly import("@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/linesDiffComputer").MovedText[];
+    }>;
     get linesAdded(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;
     get linesRemoved(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;
     readonly originalURI: URI;
     private readonly _textModelChangeService;
-    constructor(resourceRef: IReference<IResolvedTextEditorModel>, _multiDiffEntryDelegate: {
-        collapse: (transaction: ITransaction | undefined) => void;
-    }, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string | undefined, markerService: IMarkerService, modelService: IModelService, textModelService: ITextModelService, languageService: ILanguageService, configService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, _textFileService: ITextFileService, fileService: IFileService, undoRedoService: IUndoRedoService, instantiationService: IInstantiationService, aiEditTelemetryService: IAiEditTelemetryService);
+    constructor(resourceRef: IReference<IResolvedTextEditorModel>, _multiDiffEntryDelegate: IMultiDiffEntryDelegate, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string | undefined, markerService: IMarkerService, modelService: IModelService, textModelService: ITextModelService, languageService: ILanguageService, configService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, _textFileService: ITextFileService, fileService: IFileService, undoRedoService: IUndoRedoService, instantiationService: IInstantiationService, aiEditTelemetryService: IAiEditTelemetryService, _editorWorkerService: IEditorWorkerService);
     equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
-    createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
+    createSnapshot(sessionId: string, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
+    getCurrentContents(): string;
     hasModificationAt(location: Location): boolean;
     restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
     resetToInitialContent(): Promise<void>;
     protected _areOriginalAndModifiedIdentical(): Promise<boolean>;
     protected _resetEditsState(tx: ITransaction): void;
     protected _createUndoRedoElement(response: IChatResponseModel): IUndoRedoElement;
-    acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
+    acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel | undefined): Promise<void>;
     protected _doAccept(): Promise<void>;
     protected _doReject(): Promise<void>;
     protected _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
     private _shouldAutoSave;
+    computeEditsFromSnapshots(beforeSnapshot: string, afterSnapshot: string): Promise<(TextEdit | ICellEditOperation)[]>;
+    save(): Promise<void>;
+    revertToDisk(): Promise<void>;
 }
+export {};