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

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

@@ -2,7 +2,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatResponseViewModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export declare class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
     private readonly _accessibilitySignalService;

package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.d.ts

@@ -1,5 +1,5 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { InlineAnchorWidget } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget";
+import { InlineAnchorWidget } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget";
 import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service";
 export declare class ChatMarkdownAnchorService extends Disposable implements IChatMarkdownAnchorService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/chat/browser/chatEdinputInputContentProvider.js

@@ -4,7 +4,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
-import { ChatInputPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
+import { ChatInputPart } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
 
 let ChatInputBoxContentProvider = class ChatInputBoxContentProvider extends Disposable {
     constructor(textModelService, modelService, languageService) {

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

@@ -30,18 +30,18 @@ export declare class ChatEditingCodeEditorIntegration implements IModifiedFileEn
     private readonly _diffHunkWidgets;
     private _viewZones;
     private readonly _accessibleDiffViewVisible;
-    constructor(_entry: IModifiedFileEntry, _editor: ICodeEditor, documentDiffInfo: IObservable<IDocumentDiff2>, _chatAgentService: IChatAgentService, _editorService: IEditorService, _accessibilitySignalsService: IAccessibilitySignalService, instantiationService: IInstantiationService);
+    constructor(_entry: IModifiedFileEntry, _editor: ICodeEditor, documentDiffInfo: IObservable<IDocumentDiff2>, renderDiffImmediately: boolean, _chatAgentService: IChatAgentService, _editorService: IEditorService, _accessibilitySignalsService: IAccessibilitySignalService, instantiationService: IInstantiationService);
     dispose(): void;
     private _clear;
     private _clearDiffRendering;
     private _updateDiffRendering;
     enableAccessibleDiffView(): void;
-    reveal(firstOrLast: boolean): void;
+    reveal(firstOrLast: boolean, preserveFocus?: boolean): void;
     next(wrap: boolean): boolean;
     previous(wrap: boolean): boolean;
     private _reveal;
     private _findClosestWidget;
-    rejectNearestChange(closestWidget: IModifiedFileEntryChangeHunk | undefined): void;
-    acceptNearestChange(closestWidget: IModifiedFileEntryChangeHunk | undefined): void;
-    toggleDiff(widget: IModifiedFileEntryChangeHunk | undefined): Promise<void>;
+    rejectNearestChange(closestWidget?: IModifiedFileEntryChangeHunk): Promise<void>;
+    acceptNearestChange(closestWidget?: IModifiedFileEntryChangeHunk): Promise<void>;
+    toggleDiff(widget: IModifiedFileEntryChangeHunk | undefined, show?: boolean): Promise<void>;
 }

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

@@ -30,9 +30,9 @@ 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-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+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 { 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 { 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';
@@ -45,7 +45,7 @@ registerCss(chatEditorController);
 let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
     static { ChatEditingCodeEditorIntegration_1 = this; }
     static { this._diffLineDecorationData = ModelDecorationOptions.register({ description: 'diff-line-decoration' }); }
-    constructor(_entry, _editor, documentDiffInfo, _chatAgentService, _editorService, _accessibilitySignalsService, instantiationService) {
+    constructor(_entry, _editor, documentDiffInfo, renderDiffImmediately, _chatAgentService, _editorService, _accessibilitySignalsService, instantiationService) {
         this._entry = _entry;
         this._editor = _editor;
         this._chatAgentService = _chatAgentService;
@@ -119,17 +119,13 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 this._clearDiffRendering();
                 return;
             }
-            if (!_entry.isCurrentlyBeingModifiedBy.read(r)) {
-                if (!this._editor.getOption(EditorOption.inDiffEditor)) {
-                    codeEditorObs.getOption(EditorOption.fontInfo).read(r);
-                    codeEditorObs.getOption(EditorOption.lineHeight).read(r);
-                    const reviewMode = _entry.reviewMode.read(r);
-                    const diff = documentDiffInfo.read(r);
-                    this._updateDiffRendering(diff, reviewMode);
-                }
-                else {
-                    this._clearDiffRendering();
-                }
+            if (!_entry.isCurrentlyBeingModifiedBy.read(r) || renderDiffImmediately) {
+                const isDiffEditor = this._editor.getOption(EditorOption.inDiffEditor);
+                codeEditorObs.getOption(EditorOption.fontInfo).read(r);
+                codeEditorObs.getOption(EditorOption.lineHeight).read(r);
+                const reviewMode = _entry.reviewMode.read(r);
+                const diff = documentDiffInfo.read(r);
+                this._updateDiffRendering(diff, reviewMode, isDiffEditor);
             }
         }));
         this._store.add(autorun(r => {
@@ -210,7 +206,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         this._diffHunksRenderStore.clear();
         this._diffVisualDecorations.clear();
     }
-    _updateDiffRendering(diff, reviewMode) {
+    _updateDiffRendering(diff, reviewMode, diffMode) {
         const chatDiffAddDecoration = ModelDecorationOptions.createDynamic({
             ...diffAddDecoration,
             stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
@@ -296,10 +292,12 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                         options: modifiedDecoration
                     });
                 }
-                if (reviewMode) {
+                let extraLines = 0;
+                if (reviewMode && !diffMode) {
                     const domNode = document.createElement('div');
                     domNode.className = 'chat-editing-original-zone view-lines line-delete monaco-mouse-cursor-text';
                     const result = renderLines(source, renderOptions, decorations, domNode);
+                    extraLines = result.heightInLines;
                     if (!isCreatedContent) {
                         const viewZoneData = {
                             afterLineNumber: diffEntry.modified.startLineNumber - 1,
@@ -309,9 +307,11 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                         };
                         this._viewZones.push(viewZoneChangeAccessor.addZone(viewZoneData));
                     }
+                }
+                if (reviewMode || diffMode) {
                     const widget = this._editor.invokeWithinContext(accessor => {
                         const instaService = accessor.get(IInstantiationService);
-                        return instaService.createInstance(DiffHunkWidget, diff, diffEntry, this._editor.getModel().getVersionId(), this._editor, isCreatedContent ? 0 : result.heightInLines);
+                        return instaService.createInstance(DiffHunkWidget, diff, diffEntry, this._editor.getModel().getVersionId(), this._editor, isCreatedContent ? 0 : extraLines);
                     });
                     widget.layout(diffEntry.modified.startLineNumber);
                     this._diffHunkWidgets.push(widget);
@@ -329,7 +329,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                     });
                 }
             }
-            this._diffVisualDecorations.set(modifiedVisualDecorations);
+            this._diffVisualDecorations.set(!diffMode ? modifiedVisualDecorations : []);
         });
         const diffHunkDecoCollection = this._editor.createDecorationsCollection(diffHunkDecorations);
         this._diffHunksRenderStore.add(toDisposable(() => {
@@ -394,7 +394,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
     enableAccessibleDiffView() {
         this._accessibleDiffViewVisible.set(true, undefined);
     }
-    reveal(firstOrLast) {
+    reveal(firstOrLast, preserveFocus) {
         const decorations = this._diffLineDecorations
             .getRanges()
             .sort((a, b) => Range.compareRangesUsingStarts(a, b));
@@ -403,7 +403,9 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         if (range) {
             this._editor.setPosition(range.getStartPosition());
             this._editor.revealRange(range);
-            this._editor.focus();
+            if (!preserveFocus) {
+                this._editor.focus();
+            }
             this._currentIndex.set(index, undefined);
         }
     }
@@ -469,21 +471,21 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         }
         return closestWidget;
     }
-    rejectNearestChange(closestWidget) {
+    async rejectNearestChange(closestWidget) {
         closestWidget = closestWidget ?? this._findClosestWidget();
         if (closestWidget instanceof DiffHunkWidget) {
-            closestWidget.reject();
+            await closestWidget.reject();
             this.next(true);
         }
     }
-    acceptNearestChange(closestWidget) {
+    async acceptNearestChange(closestWidget) {
         closestWidget = closestWidget ?? this._findClosestWidget();
         if (closestWidget instanceof DiffHunkWidget) {
-            closestWidget.accept();
+            await closestWidget.accept();
             this.next(true);
         }
     }
-    async toggleDiff(widget) {
+    async toggleDiff(widget, show) {
         if (!this._editor.hasModel()) {
             return;
         }
@@ -496,34 +498,26 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
             }
         }
         const isDiffEditor = this._editor.getOption(EditorOption.inDiffEditor);
-        if (isDiffEditor) {
-            await this._editorService.openEditor({
-                resource: this._entry.modifiedURI,
-                options: {
-                    selection,
-                    selectionRevealType: TextEditorSelectionRevealType.NearTopIfOutsideViewport
-                }
-            });
-        }
-        else {
-            const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.EditingSession)?.fullName;
+        if (show !== undefined ? show : !isDiffEditor) {
+            const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)?.fullName;
             const diffEditor = await this._editorService.openEditor({
-                original: { resource: this._entry.originalURI, options: { selection: undefined } },
-                modified: { resource: this._entry.modifiedURI, options: { selection } },
+                original: { resource: this._entry.originalURI },
+                modified: { resource: this._entry.modifiedURI },
+                options: { selection },
                 label: defaultAgentName
                     ? ( localize(
-                    4652,
+                    4716,
                     '{0} (changes from {1})',
                     basename(this._entry.modifiedURI),
                     defaultAgentName
                 ))
-                    : ( localize(4653, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                    : ( localize(4717, '{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 === WorkingSetEntryState.Accepted || state === WorkingSetEntryState.Rejected) {
+                    if (state === ModifiedFileEntryState.Accepted || state === ModifiedFileEntryState.Rejected) {
                         d.dispose();
                         const editorIdents = [];
                         for (const candidate of this._editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
@@ -538,13 +532,22 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 });
             }
         }
+        else {
+            await this._editorService.openEditor({
+                resource: this._entry.modifiedURI,
+                options: {
+                    selection,
+                    selectionRevealType: TextEditorSelectionRevealType.NearTopIfOutsideViewport
+                }
+            });
+        }
     }
 };
 ChatEditingCodeEditorIntegration = ChatEditingCodeEditorIntegration_1 = ( __decorate([
-    ( __param(3, IChatAgentService)),
-    ( __param(4, IEditorService)),
-    ( __param(5, IAccessibilitySignalService)),
-    ( __param(6, IInstantiationService))
+    ( __param(4, IChatAgentService)),
+    ( __param(5, IEditorService)),
+    ( __param(6, IAccessibilitySignalService)),
+    ( __param(7, IInstantiationService))
 ], ChatEditingCodeEditorIntegration));
 let DiffHunkWidget = class DiffHunkWidget {
     static { DiffHunkWidget_1 = this; }

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

@@ -6,16 +6,16 @@ declare abstract class ChatEditingEditorAction extends Action2 {
     run(accessor: ServicesAccessor, ...args: any[]): Promise<void>;
     abstract runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditingSession, entry: IModifiedFileEntry, integration: IModifiedFileEntryEditorIntegration, ...args: any[]): Promise<void> | void;
 }
-declare abstract class AcceptDiscardAction extends ChatEditingEditorAction {
-    readonly accept: boolean;
-    constructor(id: string, accept: boolean);
+declare abstract class KeepOrUndoAction extends ChatEditingEditorAction {
+    private _keep;
+    constructor(id: string, _keep: boolean);
     runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditingSession, entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration): Promise<void>;
 }
-export declare class AcceptAction extends AcceptDiscardAction {
+export declare class AcceptAction extends KeepOrUndoAction {
     static readonly ID = "chatEditor.action.accept";
     constructor();
 }
-export declare class RejectAction extends AcceptDiscardAction {
+export declare class RejectAction extends KeepOrUndoAction {
     static readonly ID = "chatEditor.action.reject";
     constructor();
 }

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

@@ -4,15 +4,15 @@ 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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ctxReviewModeEnabled, ctxHasRequestInProgress, ctxHasEditorModification } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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';
 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 { WorkingSetEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+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 { resolveCommandsContext } from '@codingame/monaco-vscode-fdf643f9-94dd-5510-b97a-408abf26ad92-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { MultiDiffEditorInput } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
@@ -20,6 +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';
 
 class ChatEditingEditorAction extends Action2 {
     constructor(desc) {
@@ -53,23 +54,23 @@ class NavigateAction extends ChatEditingEditorAction {
                 ? 'chatEditor.action.navigateNext'
                 : 'chatEditor.action.navigatePrevious',
             title: next
-                ? ( localize2(4654, 'Go to Next Chat Edit'))
-                : ( localize2(4655, 'Go to Previous Chat Edit')),
+                ? ( localize2(4718, 'Go to Next Chat Edit'))
+                : ( localize2(4719, 'Go to Previous Chat Edit')),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ctxHasRequestInProgress.negate()))),
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
                 primary: next
                     ? KeyMod.Alt | KeyCode.F5
                     : KeyMod.Alt | KeyMod.Shift | KeyCode.F5,
                 weight: KeybindingWeight.WorkbenchContrib,
-                when: ( ContextKeyExpr.and(ctxHasEditorModification, EditorContextKeys.focus)),
+                when: ( ContextKeyExpr.and(ctxHasEditorModification, ( ContextKeyExpr.or(EditorContextKeys.focus, NOTEBOOK_CELL_LIST_FOCUSED)))),
             },
             f1: true,
             menu: {
                 id: MenuId.ChatEditingEditorContent,
                 group: 'navigate',
                 order: !next ? 2 : 3,
-                when: ( ContextKeyExpr.and(ctxReviewModeEnabled, ( ctxHasRequestInProgress.negate())))
+                when: ( ContextKeyExpr.and(ctxReviewModeEnabled, ctxHasEditorModification))
             }
         });
         this.next = next;
@@ -99,7 +100,7 @@ async function openNextOrPreviousChange(accessor, session, entry, next) {
     while (true) {
         idx = (idx + (next ? 1 : -1) + entries.length) % entries.length;
         newEntry = entries[idx];
-        if (newEntry.state.get() === WorkingSetEntryState.Modified) {
+        if (newEntry.state.get() === ModifiedFileEntryState.Modified) {
             break;
         }
         else if (newEntry === entry) {
@@ -121,43 +122,44 @@ async function openNextOrPreviousChange(accessor, session, entry, next) {
     }
     return true;
 }
-class AcceptDiscardAction extends ChatEditingEditorAction {
-    constructor(id, accept) {
+class KeepOrUndoAction extends ChatEditingEditorAction {
+    constructor(id, _keep) {
         super({
             id,
-            title: accept
-                ? ( localize2(4656, 'Keep Chat Edits'))
-                : ( localize2(4657, 'Undo Chat Edits')),
-            shortTitle: accept
-                ? ( localize2(4658, 'Keep'))
-                : ( localize2(4659, 'Undo')),
-            tooltip: accept
-                ? ( localize2(4660, 'Keep Chat Edits in this File'))
-                : ( localize2(4661, 'Undo Chat Edits in this File')),
+            title: _keep
+                ? ( localize2(4720, 'Keep Chat Edits'))
+                : ( localize2(4721, 'Undo Chat Edits')),
+            shortTitle: _keep
+                ? ( localize2(4722, 'Keep'))
+                : ( localize2(4723, 'Undo')),
+            tooltip: _keep
+                ? ( localize2(4724, 'Keep Chat Edits in this File'))
+                : ( localize2(4725, 'Undo Chat Edits in this File')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
-            icon: accept
+            icon: _keep
                 ? Codicon.check
                 : Codicon.discard,
             f1: true,
             keybinding: {
                 when: EditorContextKeys.focus,
                 weight: KeybindingWeight.WorkbenchContrib,
-                primary: accept
+                primary: _keep
                     ? KeyMod.CtrlCmd | KeyCode.Enter
                     : KeyMod.CtrlCmd | KeyCode.Backspace
             },
             menu: {
                 id: MenuId.ChatEditingEditorContent,
                 group: 'a_resolve',
-                order: accept ? 0 : 1,
-                when: ( ContextKeyExpr.and(!accept ? ctxReviewModeEnabled : undefined, ( ctxHasRequestInProgress.negate())))
+                order: _keep ? 0 : 1,
+                when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ( ctxHasRequestInProgress.negate()))), (
+                ContextKeyExpr.and(ctxIsGlobalEditingSession, !_keep ? ctxReviewModeEnabled : undefined))))
             }
         });
-        this.accept = accept;
+        this._keep = _keep;
     }
     async runChatEditingCommand(accessor, session, entry, _integration) {
         const instaService = accessor.get(IInstantiationService);
-        if (this.accept) {
+        if (this._keep) {
             session.accept(entry.modifiedURI);
         }
         else {
@@ -166,13 +168,13 @@ class AcceptDiscardAction extends ChatEditingEditorAction {
         await instaService.invokeFunction(openNextOrPreviousChange, session, entry, true);
     }
 }
-class AcceptAction extends AcceptDiscardAction {
+class AcceptAction extends KeepOrUndoAction {
     static { this.ID = 'chatEditor.action.accept'; }
     constructor() {
         super(AcceptAction.ID, true);
     }
 }
-class RejectAction extends AcceptDiscardAction {
+class RejectAction extends KeepOrUndoAction {
     static { this.ID = 'chatEditor.action.reject'; }
     constructor() {
         super(RejectAction.ID, false);
@@ -182,13 +184,13 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? 'chatEditor.action.acceptHunk' : 'chatEditor.action.undoHunk',
-            title: _accept ? ( localize2(4662, 'Keep this Change')) : ( localize2(4663, 'Undo this Change')),
+            title: _accept ? ( localize2(4726, 'Keep this Change')) : ( localize2(4727, 'Undo this Change')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             icon: _accept ? Codicon.check : Codicon.discard,
             f1: true,
             keybinding: {
-                when: EditorContextKeys.focus,
-                weight: KeybindingWeight.WorkbenchContrib,
+                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
@@ -200,12 +202,12 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
         });
         this._accept = _accept;
     }
-    runChatEditingCommand(_accessor, _session, _entry, ctrl, ...args) {
+    async runChatEditingCommand(_accessor, _session, _entry, ctrl, ...args) {
         if (this._accept) {
-            ctrl.acceptNearestChange(args[0]);
+            await ctrl.acceptNearestChange(args[0]);
         }
         else {
-            ctrl.rejectNearestChange(args[0]);
+            await ctrl.rejectNearestChange(args[0]);
         }
     }
 }
@@ -213,13 +215,13 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.toggleDiff',
-            title: ( localize2(4664, 'Toggle Diff Editor')),
+            title: ( localize2(4728, 'Toggle Diff Editor for Chat Edits')),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
                 icon: Codicon.goToFile,
             },
-            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
+            precondition: ( ContextKeyExpr.and(ctxHasEditorModification)),
             icon: Codicon.diffSingle,
             keybinding: {
                 when: EditorContextKeys.focus,
@@ -233,7 +235,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
                     id: MenuId.ChatEditingEditorContent,
                     group: 'a_resolve',
                     order: 2,
-                    when: ( ContextKeyExpr.and(ctxReviewModeEnabled, ( ctxHasRequestInProgress.negate())))
+                    when: ( ContextKeyExpr.and(ctxReviewModeEnabled))
                 }]
         });
     }
@@ -245,7 +247,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.showAccessibleDiffView',
-            title: ( localize2(4665, 'Show Accessible Diff View')),
+            title: ( localize2(4729, 'Show Accessible Diff View for Chat Edits')),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             keybinding: {
@@ -263,7 +265,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.reviewChanges',
-            title: ( localize2(4666, "Review")),
+            title: ( localize2(4730, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             menu: [{
                     id: MenuId.ChatEditingEditorContent,
@@ -281,7 +283,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? 'chatEditing.multidiff.acceptAllFiles' : 'chatEditing.multidiff.discardAllFiles',
-            title: accept ? ( localize(4667, 'Keep All Edits')) : ( localize(4668, 'Undo All Edits')),
+            title: accept ? ( localize(4731, 'Keep All Edits')) : ( localize(4732, 'Undo All Edits')),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -328,7 +330,7 @@ function registerChatEditorActions() {
     registerAction2(class AcceptHunkAction extends AcceptRejectHunkAction {
         constructor() { super(true); }
     });
-    registerAction2(class AcceptHunkAction extends AcceptRejectHunkAction {
+    registerAction2(class RejectHunkAction extends AcceptRejectHunkAction {
         constructor() { super(false); }
     });
     registerAction2(ToggleDiffAction);
@@ -342,12 +344,12 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(4669, "Navigation Status")),
+            title: ( localize(4733, "Navigation Status")),
             precondition: ( ContextKeyExpr.false()),
         },
         group: 'navigate',
         order: -1,
-        when: ( ContextKeyExpr.and(ctxReviewModeEnabled, ( ctxHasRequestInProgress.negate()))),
+        when: ( ContextKeyExpr.and(ctxReviewModeEnabled, ctxHasEditorModification)),
     });
 }
 const navigationBearingFakeActionId = 'chatEditor.navigation.bearings';