@codingame/monaco-vscode-chat-service-override 19.1.4 → 20.0.0

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

@@ -2,8 +2,9 @@ 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-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IChatElicitationRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
 export declare class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
     private readonly _accessibilitySignalService;
     private readonly _instantiationService;
@@ -14,4 +15,5 @@ export declare class ChatAccessibilityService extends Disposable implements ICha
     constructor(_accessibilitySignalService: IAccessibilitySignalService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService);
     acceptRequest(): number;
     acceptResponse(response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
+    acceptElicitation(elicitation: IChatElicitationRequest): void;
 }

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

@@ -1,12 +1,12 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
+import { status, alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { AccessibilityProgressSignalScheduler } from '@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common/vscode/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
-import { renderStringAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
+import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
@@ -37,11 +37,17 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
             return;
         }
         const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : '';
-        const plainTextResponse = renderStringAsPlaintext(( new MarkdownString(responseContent)));
+        const plainTextResponse = renderAsPlaintext(( new MarkdownString(responseContent)));
         if (!isVoiceInput || this._configurationService.getValue(AccessibilityVoiceSettingId.AutoSynthesize) !== 'on') {
             status(plainTextResponse + errorDetails);
         }
     }
+    acceptElicitation(elicitation) {
+        const title = typeof elicitation.title === 'string' ? elicitation.title : elicitation.title.value;
+        const message = typeof elicitation.message === 'string' ? elicitation.message : elicitation.message.value;
+        alert(title + ' ' + message);
+        this._accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, { allowManyInParallel: true });
+    }
 };
 ChatAccessibilityService = ( __decorate([
     ( __param(0, IAccessibilitySignalService)),

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

@@ -8,7 +8,8 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 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 { SCMHistoryItemTransferData } from "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/scmHistoryChatContext";
+import { IChatRequestVariableEntry, OmittedState, IDiagnosticVariableEntry, ISymbolVariableEntry, ISCMHistoryItemVariableEntry } 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;
@@ -26,6 +27,7 @@ export declare class ChatAttachmentResolveService implements IChatAttachmentReso
     resolveMarkerAttachContext(markers: MarkerTransferData[]): IDiagnosticVariableEntry[];
     resolveSymbolsAttachContext(symbols: DocumentSymbolTransferData[]): ISymbolVariableEntry[];
     resolveNotebookOutputAttachContext(data: NotebookCellOutputTransferData): IChatRequestVariableEntry[];
+    resolveSourceControlHistoryItemAttachContext(data: SCMHistoryItemTransferData[]): ISCMHistoryItemVariableEntry[];
 }
 export type ImageTransferData = {
     data: Uint8Array;

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

@@ -13,14 +13,14 @@ import { isUntitledResourceEditorInput } from '@codingame/monaco-vscode-api/vsco
 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 { UntitledTextEditorInput } from '@codingame/monaco-vscode-ac93482b-2178-52df-a200-ba0d1a4963fb-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 { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getAttachableImageExtension, CHAT_ATTACHABLE_IMAGE_MIME_TYPES } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-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';
+import { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { resizeImage, imageToHash } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 
 let ChatAttachmentResolveService = class ChatAttachmentResolveService {
     constructor(fileService, editorService, textModelService, extensionService, dialogService) {
@@ -131,7 +131,7 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
             }
             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)));
+                this.dialogService.error(( localize(4788, 'Image is too large')), ( localize(4789, 'The image {0} is too large to be attached.', fileName)));
                 throw ( new Error('Image is too large'));
             }
             dataBuffer = readFile.value;
@@ -207,6 +207,18 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
         }
         return [];
     }
+    resolveSourceControlHistoryItemAttachContext(data) {
+        return ( data.map(d => ({
+            id: d.historyItem.id,
+            name: d.name,
+            value: URI.revive(d.resource),
+            historyItem: {
+                ...d.historyItem,
+                references: []
+            },
+            kind: 'scmHistoryItem'
+        })));
+    }
 };
 ChatAttachmentResolveService = ( __decorate([
     ( __param(0, IFileService)),

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-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget";
+import { InlineAnchorWidget } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-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/chatEditing/chatEditingCodeEditorIntegration.js

@@ -20,7 +20,6 @@ import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core
 import { Selection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection';
 import { TrackedRangeStickiness, MinimapPosition, OverviewRulerLane } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { ModelDecorationOptions } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
-import { InlineDecoration, InlineDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/viewModel';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
@@ -30,11 +29,12 @@ import { TextEditorSelectionRevealType } from '@codingame/monaco-vscode-api/vsco
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-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 '@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 { InlineDecoration, InlineDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/viewModel/inlineDecorations';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -507,12 +507,12 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 options: { selection },
                 label: defaultAgentName
                     ? ( localize(
-                    4838,
+                    4917,
                     '{0} (changes from {1})',
                     basename(this._entry.modifiedURI),
                     defaultAgentName
                 ))
-                    : ( localize(4839, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                    : ( localize(4918, '{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.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-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+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, 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';
@@ -12,15 +12,15 @@ import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 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-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-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';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 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-3927dd53-f845-534c-9baa-1528ff3956c8-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+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';
 
 class ChatEditingEditorAction extends Action2 {
     constructor(desc) {
@@ -54,8 +54,8 @@ class NavigateAction extends ChatEditingEditorAction {
                 ? 'chatEditor.action.navigateNext'
                 : 'chatEditor.action.navigatePrevious',
             title: next
-                ? ( localize2(4840, 'Go to Next Chat Edit'))
-                : ( localize2(4841, 'Go to Previous Chat Edit')),
+                ? ( localize2(4919, 'Go to Next Chat Edit'))
+                : ( localize2(4920, '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(4842, 'Keep Chat Edits'))
-                : ( localize2(4843, 'Undo Chat Edits')),
+                ? ( localize2(4921, 'Keep Chat Edits'))
+                : ( localize2(4922, 'Undo Chat Edits')),
             shortTitle: _keep
-                ? ( localize2(4844, 'Keep'))
-                : ( localize2(4845, 'Undo')),
+                ? ( localize2(4923, 'Keep'))
+                : ( localize2(4924, 'Undo')),
             tooltip: _keep
-                ? ( localize2(4846, 'Keep Chat Edits in this File'))
-                : ( localize2(4847, 'Undo Chat Edits in this File')),
+                ? ( localize2(4925, 'Keep Chat Edits in this File'))
+                : ( localize2(4926, '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(4848, 'Keep this Change')) : ( localize2(4849, 'Undo this Change')),
+            title: _accept ? ( localize2(4927, 'Keep this Change')) : ( localize2(4928, 'Undo this Change')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             icon: _accept ? Codicon.check : Codicon.discard,
             f1: true,
@@ -219,7 +219,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.toggleDiff',
-            title: ( localize2(4850, 'Toggle Diff Editor for Chat Edits')),
+            title: ( localize2(4929, 'Toggle Diff Editor for Chat Edits')),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -251,7 +251,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.showAccessibleDiffView',
-            title: ( localize2(4851, 'Show Accessible Diff View for Chat Edits')),
+            title: ( localize2(4930, 'Show Accessible Diff View for Chat Edits')),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             keybinding: {
@@ -269,7 +269,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.reviewChanges',
-            title: ( localize2(4852, "Review")),
+            title: ( localize2(4931, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             menu: [{
                     id: MenuId.ChatEditingEditorContent,
@@ -288,8 +288,8 @@ class AcceptAllEditsAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: AcceptAllEditsAction.ID,
-            title: ( localize2(4853, 'Keep All Chat Edits')),
-            tooltip: ( localize2(4854, 'Keep All Chat Edits in this Session')),
+            title: ( localize2(4932, 'Keep All Chat Edits')),
+            tooltip: ( localize2(4933, 'Keep All Chat Edits in this Session')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             icon: Codicon.checkAll,
             f1: true,
@@ -308,7 +308,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? 'chatEditing.multidiff.acceptAllFiles' : 'chatEditing.multidiff.discardAllFiles',
-            title: accept ? ( localize(4855, 'Keep All Edits')) : ( localize(4856, 'Undo All Edits')),
+            title: accept ? ( localize(4934, 'Keep All Edits')) : ( localize(4935, 'Undo All Edits')),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -370,7 +370,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(4857, "Navigation Status")),
+            title: ( localize(4936, "Navigation Status")),
             precondition: ( ContextKeyExpr.false()),
         },
         group: 'navigate',

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-33de3d75-8b1a-53f0-9e27-0c71c327e1a1-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
+import { EditorGroupView } from '@codingame/monaco-vscode-615ce609-8555-545a-a549-47bd9f80e9f8-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';
@@ -28,7 +28,7 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { renderIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { renderStringAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
+import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { observableFromEventOpts, observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -64,10 +64,10 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
             }
             const response = this._entry.read(r)?.lastModifyingResponse.read(r);
             if (!response) {
-                return { message: ( localize(4863, "Working...")) };
+                return { message: ( localize(4942, "Working...")) };
             }
             if (response.isPaused.read(r)) {
-                return { message: ( localize(4864, "Paused")), paused: true };
+                return { message: ( localize(4943, "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(4863, "Working...")) };
+                return { message: ( localize(4942, "Working...")) };
             }
         });
         const progressNode = createElement('div');
@@ -96,7 +96,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                 textProgress.innerText = '';
             }
             else if (value) {
-                textProgress.innerText = renderStringAsPlaintext(value.message);
+                textProgress.innerText = renderAsPlaintext(value.message);
             }
         }));
         this._toolbarNode = 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(4865, "{0} of {1}", n, changeCount));
+                                    this.label.innerText = ( localize(4944, "{0} of {1}", n, changeCount));
                                 }
                                 else {
-                                    this.label.innerText = ( localize(4866, "—"));
+                                    this.label.innerText = ( localize(4945, "—"));
                                 }
                                 this.updateTooltip();
                             }));
@@ -172,21 +172,21 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             }
                             let result;
                             if (changeCount === 1 && entriesCount === 1) {
-                                result = ( localize(4867, "1 change in 1 file"));
+                                result = ( localize(4946, "1 change in 1 file"));
                             }
                             else if (changeCount === 1) {
-                                result = ( localize(4868, "1 change in {0} files", entriesCount));
+                                result = ( localize(4947, "1 change in {0} files", entriesCount));
                             }
                             else if (entriesCount === 1) {
-                                result = ( localize(4869, "{0} changes in 1 file", changeCount));
+                                result = ( localize(4948, "{0} changes in 1 file", changeCount));
                             }
                             else {
-                                result = ( localize(4870, "{0} changes in {1} files", changeCount, entriesCount));
+                                result = ( localize(4949, "{0} changes in {1} files", changeCount, entriesCount));
                             }
                             if (!that._isBusy.get()) {
                                 return result;
                             }
-                            return localize(4871, "{0} - Working...", result);
+                            return localize(4950, "{0} - Working...", result);
                         }
                     });
                 }
@@ -235,7 +235,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             if (!kb) {
                                 return value;
                             }
-                            return localize(4872, "{0} ({1})", value, kb.getLabel());
+                            return localize(4951, "{0} ({1})", value, kb.getLabel());
                         }
                     });
                 }

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

@@ -17,7 +17,7 @@ import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-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";
 export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifiedFileEntry implements IModifiedFileEntry {

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

@@ -44,7 +44,10 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         this._textModelChangeService = this._register(instantiationService.createInstance(ChatEditingTextModelChangeService, this.originalModel, this.modifiedModel, this._stateObs));
         this._register(this._textModelChangeService.onDidAcceptOrRejectAllHunks(action => {
             this._stateObs.set(action, undefined);
-            this._notifyAction(action === ModifiedFileEntryState.Accepted ? 'accepted' : 'rejected');
+            this._notifySessionAction(action === ModifiedFileEntryState.Accepted ? 'accepted' : 'rejected');
+        }));
+        this._register(this._textModelChangeService.onDidAcceptOrRejectLines(action => {
+            this._notifyAction({ kind: 'chatEditingHunkAction', uri: this.modifiedURI, outcome: action.state, lineCount: action.lineCount, hasRemainingEdits: action.hasRemainingEdits });
         }));
         (async () => {
             const reference = await textModelService.createModelReference(docSnapshot.uri);
@@ -67,7 +70,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             if (inProgress) {
                 const res = this._lastModifyingResponseObs.read(r);
                 const req = res && res.session.getRequests().find(value => value.id === res.requestId);
-                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(4873, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(4952, "Chat Edits")));
             }
             else {
                 resourceFilter.clear();
@@ -109,7 +112,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(4874, "Chat Edit: '{0}'", request.message.text)) : ( localize(4875, "Chat Edit"));
+        const label = request?.message.text ? ( localize(4953, "Chat Edit: '{0}'", request.message.text)) : ( localize(4954, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {

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

@@ -13,7 +13,8 @@ import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/co
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatUserAction } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 declare class AutoAcceptControl {
     readonly total: number;
@@ -66,7 +67,8 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     protected abstract _doAccept(): Promise<void>;
     reject(): Promise<void>;
     protected abstract _doReject(): Promise<void>;
-    protected _notifyAction(outcome: "accepted" | "rejected" | "userModified"): void;
+    protected _notifySessionAction(outcome: "accepted" | "rejected" | "userModified"): void;
+    protected _notifyAction(action: ChatUserAction): void;
     private readonly _editorIntegrations;
     getEditorIntegration(pane: IEditorPane): IModifiedFileEntryEditorIntegration;
     protected abstract _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;

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

@@ -40,7 +40,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(4876, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(4955, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static { AbstractChatEditingModifiedFileEntry_1 = this; }
     static { this.scheme = 'modified-file-entry'; }
@@ -80,7 +80,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._autoAcceptCtrl = observableValue(this, undefined);
         this.autoAcceptController = this._autoAcceptCtrl;
         this._refCounter = 1;
-        this._userEditScheduler = this._register(( new RunOnceScheduler(() => this._notifyAction('userModified'), 1000)));
+        this._userEditScheduler = this._register(( new RunOnceScheduler(() => this._notifySessionAction('userModified'), 1000)));
         this._editorIntegrations = this._register(( new DisposableMap()));
         if (kind === ChatEditKind.Created) {
             this.createdInRequestId = this._telemetryInfo.requestId;
@@ -172,22 +172,25 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
             this._stateObs.set(ModifiedFileEntryState.Accepted, tx);
             this._autoAcceptCtrl.set(undefined, tx);
         });
-        this._notifyAction('accepted');
+        this._notifySessionAction('accepted');
     }
     async reject() {
         if (this._stateObs.get() !== ModifiedFileEntryState.Modified) {
             return;
         }
-        this._notifyAction('rejected');
+        this._notifySessionAction('rejected');
         await this._doReject();
         transaction(tx => {
             this._stateObs.set(ModifiedFileEntryState.Rejected, tx);
             this._autoAcceptCtrl.set(undefined, tx);
         });
     }
-    _notifyAction(outcome) {
+    _notifySessionAction(outcome) {
+        this._notifyAction({ kind: 'chatEditingSessionAction', uri: this.modifiedURI, hasRemainingEdits: false, outcome });
+    }
+    _notifyAction(action) {
         this._chatService.notifyUserAction({
-            action: { kind: 'chatEditingSessionAction', uri: this.modifiedURI, hasRemainingEdits: false, outcome },
+            action,
             agentId: this._telemetryInfo.agentId,
             command: this._telemetryInfo.command,
             sessionId: this._telemetryInfo.sessionId,

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

@@ -19,7 +19,7 @@ import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-ap
 import { INotebookLoggingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service";
 import { INotebookEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService.service";
 import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-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";
 import { ChatEditingNotebookCellEntry } from "./notebook/chatEditingNotebookCellEntry.js";

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

@@ -27,7 +27,7 @@ import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/com
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellEditType, NotebookCellsChangeType, NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { computeDiff } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
@@ -177,7 +177,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         try {
             this._isProcessingResponse.set(true, undefined);
             const notebookDiff = await this.notebookEditorWorkerService.computeDiff(this.originalURI, this.modifiedURI);
-            if (id !== this.computeRequestId) {
+            if (id !== this.computeRequestId || this._store.isDisposed) {
                 return;
             }
             const result = computeDiff(this.originalModel, this.modifiedModel, notebookDiff);
@@ -207,7 +207,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
             this.updateCellDiffInfo([], undefined);
             this.initializeModelsFromDiff();
-            this._notifyAction('rejected');
+            this._notifySessionAction('rejected');
             return;
         }
         if (!e.rawEvents.length) {
@@ -396,7 +396,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(4877, "Chat Edit: '{0}'", request.message.text)) : ( localize(4878, "Chat Edit"));
+        const label = request?.message.text ? ( localize(4956, "Chat Edit: '{0}'", request.message.text)) : ( localize(4957, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
@@ -422,7 +422,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
                 this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
                 this.updateCellDiffInfo([], undefined);
                 this.initializeModelsFromDiff();
-                this._notifyAction('userModified');
+                this._notifySessionAction('userModified');
             },
             redo: async () => {
                 initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
@@ -437,7 +437,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
                 this._stateObs.set(redoState, undefined);
                 this.updateCellDiffInfo([], undefined);
                 this.initializeModelsFromDiff();
-                this._notifyAction('userModified');
+                this._notifySessionAction('userModified');
             }
         };
     }
@@ -469,7 +469,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             })));
             this.editedCells.clear();
         };
-        this._applyEdits(async () => {
+        await this._applyEdits(async () => {
             await Promise.all(( edits.map(async (edit, idx) => {
                 const last = isLastEdits && idx === edits.length - 1;
                 if (TextEdit.isTextEdit(edit)) {
@@ -571,7 +571,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         if (( new SnapshotComparer(currentSnapshot)).isEqual(this.originalModel)) {
             const state = accepted ? ModifiedFileEntryState.Accepted : ModifiedFileEntryState.Rejected;
             this._stateObs.set(state, undefined);
-            this._notifyAction(accepted ? 'accepted' : 'rejected');
+            this._notifySessionAction(accepted ? 'accepted' : 'rejected');
         }
     }
     createModifiedCellDiffInfo(modifiedCellIndex, originalCellIndex) {
@@ -625,6 +625,9 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             return true;
         };
         this.resolveCellModel(cell.uri).then(modifiedModel => {
+            if (this._store.isDisposed) {
+                return;
+            }
             this.getOrCreateModifiedTextFileEntryForCell(cell, modifiedModel, originalModel);
         });
         return {