@codingame/monaco-vscode-chat-service-override 18.3.1 → 19.0.0

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

@@ -33,7 +33,7 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         const isPanelChat = typeof response !== 'string';
         const responseContent = typeof response === 'string' ? response : response?.response.toString();
         this._accessibilitySignalService.playSignal(AccessibilitySignal.chatResponseReceived, { allowManyInParallel: true });
-        if (!response || !responseContent) {
+        if (!response) {
             return;
         }
         const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : '';

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

@@ -0,0 +1,38 @@
+import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
+import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
+import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IDraggedResourceEditorInput, MarkerTransferData, DocumentSymbolTransferData, NotebookCellOutputTransferData } from "@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { EditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
+import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IChatRequestVariableEntry, OmittedState, IDiagnosticVariableEntry, ISymbolVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
+import { IChatAttachmentResolveService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.service";
+export declare class ChatAttachmentResolveService implements IChatAttachmentResolveService {
+    private fileService;
+    private editorService;
+    private textModelService;
+    private extensionService;
+    private dialogService;
+    _serviceBrand: undefined;
+    constructor(fileService: IFileService, editorService: IEditorService, textModelService: ITextModelService, extensionService: IExtensionService, dialogService: IDialogService);
+    resolveEditorAttachContext(editor: EditorInput | IDraggedResourceEditorInput): Promise<IChatRequestVariableEntry | undefined>;
+    resolveUntitledEditorAttachContext(editor: IDraggedResourceEditorInput): Promise<IChatRequestVariableEntry | undefined>;
+    resolveResourceAttachContext(resource: URI, isDirectory: boolean): Promise<IChatRequestVariableEntry | undefined>;
+    resolveImageEditorAttachContext(resource: URI, data?: VSBuffer, mimeType?: string): Promise<IChatRequestVariableEntry | undefined>;
+    resolveImageAttachContext(images: ImageTransferData[]): Promise<IChatRequestVariableEntry[]>;
+    resolveMarkerAttachContext(markers: MarkerTransferData[]): IDiagnosticVariableEntry[];
+    resolveSymbolsAttachContext(symbols: DocumentSymbolTransferData[]): ISymbolVariableEntry[];
+    resolveNotebookOutputAttachContext(data: NotebookCellOutputTransferData): IChatRequestVariableEntry[];
+}
+export type ImageTransferData = {
+    data: Uint8Array;
+    name: string;
+    icon?: ThemeIcon;
+    resource?: URI;
+    id?: string;
+    mimeType?: string;
+    omittedState?: OmittedState;
+};

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

@@ -0,0 +1,234 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { SymbolKinds } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
+import { isUntitledResourceEditorInput } 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 { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { UntitledTextEditorInput } from '@codingame/monaco-vscode-ddbd4d51-94af-51e5-96b5-f2166ed67ad0-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
+import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST, createNotebookOutputVariableEntry } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils';
+import { getOutputViewModelFromId } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getAttachableImageExtension, CHAT_ATTACHABLE_IMAGE_MIME_TYPES } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { OmittedState, toPromptFileVariableEntry, PromptFileVariableKind, IDiagnosticVariableEntryFilterData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
+import { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { resizeImage, imageToHash } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+
+let ChatAttachmentResolveService = class ChatAttachmentResolveService {
+    constructor(fileService, editorService, textModelService, extensionService, dialogService) {
+        this.fileService = fileService;
+        this.editorService = editorService;
+        this.textModelService = textModelService;
+        this.extensionService = extensionService;
+        this.dialogService = dialogService;
+    }
+    async resolveEditorAttachContext(editor) {
+        if (isUntitledResourceEditorInput(editor)) {
+            return await this.resolveUntitledEditorAttachContext(editor);
+        }
+        if (!editor.resource) {
+            return undefined;
+        }
+        let stat;
+        try {
+            stat = await this.fileService.stat(editor.resource);
+        }
+        catch {
+            return undefined;
+        }
+        if (!stat.isDirectory && !stat.isFile) {
+            return undefined;
+        }
+        const imageContext = await this.resolveImageEditorAttachContext(editor.resource);
+        if (imageContext) {
+            return ( this.extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData'))) ? imageContext : undefined;
+        }
+        return await this.resolveResourceAttachContext(editor.resource, stat.isDirectory);
+    }
+    async resolveUntitledEditorAttachContext(editor) {
+        if (editor.resource) {
+            return await this.resolveResourceAttachContext(editor.resource, false);
+        }
+        const openUntitledEditors = this.editorService.editors.filter(editor => editor instanceof UntitledTextEditorInput);
+        for (const canidate of openUntitledEditors) {
+            const model = await canidate.resolve();
+            const contents = model.textEditorModel?.getValue();
+            if (contents === editor.contents) {
+                return await this.resolveResourceAttachContext(canidate.resource, false);
+            }
+        }
+        return undefined;
+    }
+    async resolveResourceAttachContext(resource, isDirectory) {
+        let omittedState = OmittedState.NotOmitted;
+        if (!isDirectory) {
+            let languageId;
+            try {
+                const createdModel = await this.textModelService.createModelReference(resource);
+                languageId = createdModel.object.getLanguageId();
+                createdModel.dispose();
+            }
+            catch {
+                omittedState = OmittedState.Full;
+            }
+            if (/\.(svg)$/i.test(resource.path)) {
+                omittedState = OmittedState.Full;
+            }
+            if (languageId) {
+                const promptsType = getPromptsTypeForLanguageId(languageId);
+                if (promptsType === PromptsType.prompt) {
+                    return toPromptFileVariableEntry(resource, PromptFileVariableKind.PromptFile);
+                }
+                else if (promptsType === PromptsType.instructions) {
+                    return toPromptFileVariableEntry(resource, PromptFileVariableKind.Instruction);
+                }
+            }
+        }
+        return {
+            kind: isDirectory ? 'directory' : 'file',
+            value: resource,
+            id: ( resource.toString()),
+            name: basename(resource),
+            omittedState
+        };
+    }
+    async resolveImageEditorAttachContext(resource, data, mimeType) {
+        if (!resource) {
+            return undefined;
+        }
+        if (mimeType) {
+            if (!getAttachableImageExtension(mimeType)) {
+                return undefined;
+            }
+        }
+        else {
+            const match = SUPPORTED_IMAGE_EXTENSIONS_REGEX.exec(resource.path);
+            if (!match) {
+                return undefined;
+            }
+            mimeType = getMimeTypeFromPath(match);
+        }
+        const fileName = basename(resource);
+        let dataBuffer;
+        if (data) {
+            dataBuffer = data;
+        }
+        else {
+            let stat;
+            try {
+                stat = await this.fileService.stat(resource);
+            }
+            catch {
+                return undefined;
+            }
+            const readFile = await this.fileService.readFile(resource);
+            if (stat.size > 30 * 1024 * 1024) {
+                this.dialogService.error(( localize(4720, 'Image is too large')), ( localize(4721, 'The image {0} is too large to be attached.', fileName)));
+                throw ( new Error('Image is too large'));
+            }
+            dataBuffer = readFile.value;
+        }
+        const isPartiallyOmitted = /\.gif$/i.test(resource.path);
+        const imageFileContext = await this.resolveImageAttachContext([{
+                id: ( resource.toString()),
+                name: fileName,
+                data: dataBuffer.buffer,
+                icon: Codicon.fileMedia,
+                resource: resource,
+                mimeType: mimeType,
+                omittedState: isPartiallyOmitted ? OmittedState.Partial : OmittedState.NotOmitted
+            }]);
+        return imageFileContext[0];
+    }
+    resolveImageAttachContext(images) {
+        return Promise.all(( images.map(async (image) => ({
+            id: image.id || (await imageToHash(image.data)),
+            name: image.name,
+            fullName: image.resource ? image.resource.path : undefined,
+            value: await resizeImage(image.data, image.mimeType),
+            icon: image.icon,
+            kind: 'image',
+            isFile: false,
+            isDirectory: false,
+            omittedState: image.omittedState || OmittedState.NotOmitted,
+            references: image.resource ? [{ reference: image.resource, kind: 'reference' }] : []
+        }))));
+    }
+    resolveMarkerAttachContext(markers) {
+        return ( markers.map((marker) => {
+            let filter;
+            if (!('severity' in marker)) {
+                filter = { filterUri: URI.revive(marker.uri), filterSeverity: MarkerSeverity.Warning };
+            }
+            else {
+                filter = IDiagnosticVariableEntryFilterData.fromMarker(marker);
+            }
+            return IDiagnosticVariableEntryFilterData.toEntry(filter);
+        }));
+    }
+    resolveSymbolsAttachContext(symbols) {
+        return ( symbols.map(symbol => {
+            const resource = URI.file(symbol.fsPath);
+            return {
+                kind: 'symbol',
+                id: symbolId(resource, symbol.range),
+                value: { uri: resource, range: symbol.range },
+                symbolKind: symbol.kind,
+                icon: SymbolKinds.toIcon(symbol.kind),
+                fullName: symbol.name,
+                name: symbol.name,
+            };
+        }));
+    }
+    resolveNotebookOutputAttachContext(data) {
+        const notebookEditor = getNotebookEditorFromEditorPane(this.editorService.activeEditorPane);
+        if (!notebookEditor) {
+            return [];
+        }
+        const outputViewModel = getOutputViewModelFromId(data.outputId, notebookEditor);
+        if (!outputViewModel) {
+            return [];
+        }
+        const mimeType = outputViewModel.pickedMimeType?.mimeType;
+        if (mimeType && NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST.includes(mimeType)) {
+            const entry = createNotebookOutputVariableEntry(outputViewModel, mimeType, notebookEditor);
+            if (!entry) {
+                return [];
+            }
+            return [entry];
+        }
+        return [];
+    }
+};
+ChatAttachmentResolveService = ( __decorate([
+    ( __param(0, IFileService)),
+    ( __param(1, IEditorService)),
+    ( __param(2, ITextModelService)),
+    ( __param(3, IExtensionService)),
+    ( __param(4, IDialogService))
+], ChatAttachmentResolveService));
+function symbolId(resource, range) {
+    let rangePart = '';
+    if (range) {
+        rangePart = `:${range.startLineNumber}`;
+        if (range.startLineNumber !== range.endLineNumber) {
+            rangePart += `-${range.endLineNumber}`;
+        }
+    }
+    return resource.fsPath + rangePart;
+}
+const SUPPORTED_IMAGE_EXTENSIONS_REGEX = ( new RegExp(`\\.(${( Object.keys(CHAT_ATTACHABLE_IMAGE_MIME_TYPES)).join('|')})$`, 'i'));
+function getMimeTypeFromPath(match) {
+    const ext = match[1].toLowerCase();
+    return CHAT_ATTACHABLE_IMAGE_MIME_TYPES[ext];
+}
+
+export { ChatAttachmentResolveService };

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

@@ -1,17 +1,17 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
 
 let ChatInputBoxContentProvider = class ChatInputBoxContentProvider extends Disposable {
     constructor(textModelService, modelService, languageService) {
         super();
         this.modelService = modelService;
         this.languageService = languageService;
-        this._register(textModelService.registerTextModelContentProvider(ChatInputPart.INPUT_SCHEME, this));
+        this._register(textModelService.registerTextModelContentProvider(Schemas.vscodeChatInput, this));
     }
     async provideTextContent(resource) {
         const existing = this.modelService.getModel(resource);

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

@@ -264,7 +264,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                     }
                 }
                 const isCreatedContent = decorations.length === 1 && decorations[0].range.isEmpty() && diffEntry.original.startLineNumber === 1;
-                if (!diffEntry.modified.isEmpty && !(isCreatedContent && (diffEntry.modified.endLineNumberExclusive - 1) === editorLineCount)) {
+                if (!diffEntry.modified.isEmpty) {
                     modifiedVisualDecorations.push({
                         range: diffEntry.modified.toInclusiveRange(),
                         options: chatDiffWholeLineAddDecoration
@@ -507,12 +507,12 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 options: { selection },
                 label: defaultAgentName
                     ? ( localize(
-                    4758,
+                    4838,
                     '{0} (changes from {1})',
                     basename(this._entry.modifiedURI),
                     defaultAgentName
                 ))
-                    : ( localize(4759, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                    : ( localize(4839, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
             });
             if (diffEditor && diffEditor.input) {
                 diffEditor.getControl()?.setSelection(selection);

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

@@ -23,6 +23,11 @@ export declare class ReviewChangesAction extends ChatEditingEditorAction {
     constructor();
     runChatEditingCommand(_accessor: ServicesAccessor, _session: IChatEditingSession, entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration, ..._args: any[]): 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>;
+}
 export declare function registerChatEditorActions(): void;
 export declare const navigationBearingFakeActionId = "chatEditor.navigation.bearings";
 export {};

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-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-c87fff3a-2aa9-52ab-ba4d-17e8d1e5e185-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-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(4760, 'Go to Next Chat Edit'))
-                : ( localize2(4761, 'Go to Previous Chat Edit')),
+                ? ( localize2(4840, 'Go to Next Chat Edit'))
+                : ( localize2(4841, 'Go to Previous Chat Edit')),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -127,14 +127,14 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
         super({
             id,
             title: _keep
-                ? ( localize2(4762, 'Keep Chat Edits'))
-                : ( localize2(4763, 'Undo Chat Edits')),
+                ? ( localize2(4842, 'Keep Chat Edits'))
+                : ( localize2(4843, 'Undo Chat Edits')),
             shortTitle: _keep
-                ? ( localize2(4764, 'Keep'))
-                : ( localize2(4765, 'Undo')),
+                ? ( localize2(4844, 'Keep'))
+                : ( localize2(4845, 'Undo')),
             tooltip: _keep
-                ? ( localize2(4766, 'Keep Chat Edits in this File'))
-                : ( localize2(4767, 'Undo Chat Edits in this File')),
+                ? ( localize2(4846, 'Keep Chat Edits in this File'))
+                : ( localize2(4847, 'Undo Chat Edits in this File')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             icon: _keep
                 ? Codicon.check
@@ -184,7 +184,7 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? 'chatEditor.action.acceptHunk' : 'chatEditor.action.undoHunk',
-            title: _accept ? ( localize2(4768, 'Keep this Change')) : ( localize2(4769, 'Undo this Change')),
+            title: _accept ? ( localize2(4848, 'Keep this Change')) : ( localize2(4849, 'Undo this Change')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             icon: _accept ? Codicon.check : Codicon.discard,
             f1: true,
@@ -202,20 +202,24 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
         });
         this._accept = _accept;
     }
-    async runChatEditingCommand(_accessor, _session, _entry, ctrl, ...args) {
+    async runChatEditingCommand(accessor, session, entry, ctrl, ...args) {
+        const instaService = accessor.get(IInstantiationService);
         if (this._accept) {
             await ctrl.acceptNearestChange(args[0]);
         }
         else {
             await ctrl.rejectNearestChange(args[0]);
         }
+        if (entry.changesCount.get() === 0) {
+            await instaService.invokeFunction(openNextOrPreviousChange, session, entry, true);
+        }
     }
 }
 class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.toggleDiff',
-            title: ( localize2(4770, 'Toggle Diff Editor for Chat Edits')),
+            title: ( localize2(4850, 'Toggle Diff Editor for Chat Edits')),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -247,7 +251,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.showAccessibleDiffView',
-            title: ( localize2(4771, 'Show Accessible Diff View for Chat Edits')),
+            title: ( localize2(4851, 'Show Accessible Diff View for Chat Edits')),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             keybinding: {
@@ -265,7 +269,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.reviewChanges',
-            title: ( localize2(4772, "Review")),
+            title: ( localize2(4852, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             menu: [{
                     id: MenuId.ChatEditingEditorContent,
@@ -279,11 +283,32 @@ class ReviewChangesAction extends ChatEditingEditorAction {
         entry.enableReviewModeUntilSettled();
     }
 }
+class AcceptAllEditsAction extends ChatEditingEditorAction {
+    static { this.ID = 'chatEditor.action.acceptAllEdits'; }
+    constructor() {
+        super({
+            id: AcceptAllEditsAction.ID,
+            title: ( localize2(4853, 'Keep All Chat Edits')),
+            tooltip: ( localize2(4854, 'Keep All Chat Edits in this Session')),
+            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
+            icon: Codicon.checkAll,
+            f1: true,
+            keybinding: {
+                when: ( ContextKeyExpr.or(EditorContextKeys.focus, NOTEBOOK_EDITOR_FOCUSED)),
+                weight: KeybindingWeight.WorkbenchContrib + 10,
+                primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyY,
+            },
+        });
+    }
+    async runChatEditingCommand(_accessor, session, _entry, _integration, ..._args) {
+        await session.accept();
+    }
+}
 class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? 'chatEditing.multidiff.acceptAllFiles' : 'chatEditing.multidiff.discardAllFiles',
-            title: accept ? ( localize(4773, 'Keep All Edits')) : ( localize(4774, 'Undo All Edits')),
+            title: accept ? ( localize(4855, 'Keep All Edits')) : ( localize(4856, 'Undo All Edits')),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -327,6 +352,7 @@ function registerChatEditorActions() {
     registerAction2(ReviewChangesAction);
     registerAction2(AcceptAction);
     registerAction2(RejectAction);
+    registerAction2(AcceptAllEditsAction);
     registerAction2(class AcceptHunkAction extends AcceptRejectHunkAction {
         constructor() { super(true); }
     });
@@ -344,7 +370,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(4775, "Navigation Status")),
+            title: ( localize(4857, "Navigation Status")),
             precondition: ( ContextKeyExpr.false()),
         },
         group: 'navigate',
@@ -354,4 +380,4 @@ function registerChatEditorActions() {
 }
 const navigationBearingFakeActionId = 'chatEditor.navigation.bearings';
 
-export { AcceptAction, RejectAction, ReviewChangesAction, navigationBearingFakeActionId, registerChatEditorActions };
+export { AcceptAction, AcceptAllEditsAction, RejectAction, 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-c3c61c00-c254-5856-9dc9-d7929c1f9062-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
+import { EditorGroupView } from '@codingame/monaco-vscode-33de3d75-8b1a-53f0-9e27-0c71c327e1a1-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';
@@ -64,10 +64,10 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
             }
             const response = this._entry.read(r)?.lastModifyingResponse.read(r);
             if (!response) {
-                return { message: ( localize(4781, "Working...")) };
+                return { message: ( localize(4863, "Working...")) };
             }
             if (response.isPaused.read(r)) {
-                return { message: ( localize(4782, "Paused")), paused: true };
+                return { message: ( localize(4864, "Paused")), paused: true };
             }
             const lastPart = observableFromEventOpts({ equalsFn: equals }, response.onDidChange, () => response.response.value)
                 .read(r)
@@ -80,7 +80,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                 return { message: lastPart.content };
             }
             else {
-                return { message: ( localize(4781, "Working...")) };
+                return { message: ( localize(4863, "Working...")) };
             }
         });
         const progressNode = document.createElement('div');
@@ -157,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(4783, "{0} of {1}", n, changeCount));
+                                    this.label.innerText = ( localize(4865, "{0} of {1}", n, changeCount));
                                 }
                                 else {
-                                    this.label.innerText = ( localize(4784, "—"));
+                                    this.label.innerText = ( localize(4866, "—"));
                                 }
                                 this.updateTooltip();
                             }));
@@ -172,21 +172,21 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             }
                             let result;
                             if (changeCount === 1 && entriesCount === 1) {
-                                result = ( localize(4785, "1 change in 1 file"));
+                                result = ( localize(4867, "1 change in 1 file"));
                             }
                             else if (changeCount === 1) {
-                                result = ( localize(4786, "1 change in {0} files", entriesCount));
+                                result = ( localize(4868, "1 change in {0} files", entriesCount));
                             }
                             else if (entriesCount === 1) {
-                                result = ( localize(4787, "{0} changes in 1 file", changeCount));
+                                result = ( localize(4869, "{0} changes in 1 file", changeCount));
                             }
                             else {
-                                result = ( localize(4788, "{0} changes in {1} files", changeCount, entriesCount));
+                                result = ( localize(4870, "{0} changes in {1} files", changeCount, entriesCount));
                             }
                             if (!that._isBusy.get()) {
                                 return result;
                             }
-                            return localize(4789, "{0} - Working...", result);
+                            return localize(4871, "{0} - Working...", result);
                         }
                     });
                 }
@@ -235,7 +235,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             if (!kb) {
                                 return value;
                             }
-                            return localize(4790, "{0} ({1})", value, kb.getLabel());
+                            return localize(4872, "{0} ({1})", value, kb.getLabel());
                         }
                     });
                 }