@codingame/monaco-vscode-chat-service-override 21.6.0 → 22.0.0

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

@@ -5,15 +5,21 @@ import { IChatAccessibilityService } from "@codingame/monaco-vscode-api/vscode/v
 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";
+import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
+import { ChatWidget } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
 export declare class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
     private readonly _accessibilitySignalService;
     private readonly _instantiationService;
     private readonly _configurationService;
+    private readonly _hostService;
     readonly _serviceBrand: undefined;
     private _pendingSignalMap;
     private _requestId;
-    constructor(_accessibilitySignalService: IAccessibilitySignalService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService);
+    private readonly notifications;
+    constructor(_accessibilitySignalService: IAccessibilitySignalService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService, _hostService: IHostService);
+    dispose(): void;
     acceptRequest(): number;
-    acceptResponse(response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
+    acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
     acceptElicitation(elicitation: IChatElicitationRequest): void;
+    private _showOSNotification;
 }

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 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 { Disposable, DisposableMap, DisposableStore } 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';
@@ -10,17 +10,32 @@ import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/b
 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';
+import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { FocusMode } from '@codingame/monaco-vscode-09e9b2e8-42a8-5a68-864f-bfcdad0ca1df-common/vscode/vs/platform/native/common/native';
+import { getWindow, triggerNotification } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { AccessibilityVoiceSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService';
 
 const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 let ChatAccessibilityService = class ChatAccessibilityService extends Disposable {
-    constructor(_accessibilitySignalService, _instantiationService, _configurationService) {
+    constructor(_accessibilitySignalService, _instantiationService, _configurationService, _hostService) {
         super();
         this._accessibilitySignalService = _accessibilitySignalService;
         this._instantiationService = _instantiationService;
         this._configurationService = _configurationService;
+        this._hostService = _hostService;
         this._pendingSignalMap = this._register(( new DisposableMap()));
         this._requestId = 0;
+        this.notifications = ( new Set());
+    }
+    dispose() {
+        for (const ds of Array.from(this.notifications)) {
+            ds.dispose();
+        }
+        this.notifications.clear();
+        super.dispose();
     }
     acceptRequest() {
         this._requestId++;
@@ -28,31 +43,83 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         this._pendingSignalMap.set(this._requestId, this._instantiationService.createInstance(AccessibilityProgressSignalScheduler, CHAT_RESPONSE_PENDING_ALLOWANCE_MS, undefined));
         return this._requestId;
     }
-    acceptResponse(response, requestId, isVoiceInput) {
+    acceptResponse(widget, container, response, requestId, isVoiceInput) {
         this._pendingSignalMap.deleteAndDispose(requestId);
         const isPanelChat = typeof response !== 'string';
         const responseContent = typeof response === 'string' ? response : response?.response.toString();
         this._accessibilitySignalService.playSignal(AccessibilitySignal.chatResponseReceived, { allowManyInParallel: true });
-        if (!response) {
+        if (!response || !responseContent) {
             return;
         }
-        const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : '';
         const plainTextResponse = renderAsPlaintext(( new MarkdownString(responseContent)));
+        const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : '';
+        this._showOSNotification(widget, container, plainTextResponse + errorDetails);
         if (!isVoiceInput || this._configurationService.getValue(AccessibilityVoiceSettingId.AutoSynthesize) !== 'on') {
             status(plainTextResponse + errorDetails);
         }
     }
     acceptElicitation(elicitation) {
+        if (elicitation.state !== 'pending') {
+            return;
+        }
         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 });
     }
+    async _showOSNotification(widget, container, responseContent) {
+        if (!this._configurationService.getValue(ChatConfiguration.NotifyWindowOnResponseReceived)) {
+            return;
+        }
+        const targetWindow = getWindow(container);
+        if (!targetWindow) {
+            return;
+        }
+        if (targetWindow.document.hasFocus()) {
+            return;
+        }
+        if (!responseContent || !responseContent.trim()) {
+            return;
+        }
+        await this._hostService.focus(targetWindow, { mode: FocusMode.Notify });
+        for (const ds of Array.from(this.notifications)) {
+            ds.dispose();
+            this.notifications.delete(ds);
+        }
+        const chatTitle = widget.viewModel?.model.title || ( localize(4891, "Untitled Chat"));
+        const maxDetailLength = 100;
+        const truncatedResponse = responseContent.length > maxDetailLength
+            ? responseContent.substring(0, maxDetailLength) + '...'
+            : responseContent;
+        const notification = await triggerNotification(chatTitle, {
+            detail: truncatedResponse,
+            sticky: false,
+        });
+        if (!notification) {
+            return;
+        }
+        const disposables = ( new DisposableStore());
+        disposables.add(notification);
+        this.notifications.add(disposables);
+        disposables.add(Event.once(notification.onClick)(async () => {
+            await this._hostService.focus(targetWindow, { mode: FocusMode.Force });
+            widget.input.focus();
+            disposables.dispose();
+            this.notifications.delete(disposables);
+        }));
+        disposables.add(this._hostService.onDidChangeFocus(focus => {
+            if (focus) {
+                disposables.dispose();
+                this.notifications.delete(disposables);
+            }
+        }));
+    }
 };
 ChatAccessibilityService = ( __decorate([
     ( __param(0, IAccessibilitySignalService)),
     ( __param(1, IInstantiationService)),
-    ( __param(2, IConfigurationService))
+    ( __param(2, IConfigurationService)),
+    ( __param(3, IHostService))
 ], ChatAccessibilityService));
 
 export { ChatAccessibilityService };

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

@@ -8,7 +8,7 @@ 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 { SCMHistoryItemTransferData } from "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/scmHistoryChatContext";
+import { SCMHistoryItemTransferData } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-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 {

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

@@ -20,7 +20,7 @@ import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae
 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-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';
+import { resizeImage, imageToHash } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-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(4853, 'Image is too large')), ( localize(4854, 'The image {0} is too large to be attached.', fileName)));
+                this.dialogService.error(( localize(4894, 'Image is too large')), ( localize(4895, 'The image {0} is too large to be attached.', fileName)));
                 throw ( new Error('Image is too large'));
             }
             dataBuffer = readFile.value;

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

@@ -14,12 +14,13 @@ import { AccessibleDiffViewer } from '@codingame/monaco-vscode-api/vscode/vs/edi
 import { RenderOptions, LineSource, renderLines } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines';
 import { diffAddDecoration, diffWholeLineAddDecoration, diffDeleteDecoration } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/diffEditor/registrations.contribution';
 import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
-import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
 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/inlineDecorations';
 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';
@@ -32,9 +33,8 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 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 { 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 { InlineDecoration, InlineDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/viewModel/inlineDecorations';
+import { isTextDiffEditorForEntry } from './chatEditing.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -500,19 +500,19 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         }
         const isDiffEditor = this._editor.getOption(EditorOption.inDiffEditor);
         if (show !== undefined ? show : !isDiffEditor) {
-            const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)?.fullName;
+            const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Chat)?.fullName;
             const diffEditor = await this._editorService.openEditor({
                 original: { resource: this._entry.originalURI },
                 modified: { resource: this._entry.modifiedURI },
                 options: { selection },
                 label: defaultAgentName
                     ? ( localize(
-                    5013,
+                    5063,
                     '{0} (changes from {1})',
                     basename(this._entry.modifiedURI),
                     defaultAgentName
                 ))
-                    : ( localize(5014, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                    : ( localize(5064, '{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

@@ -1,26 +1,26 @@
 
-import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-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-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';
-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 { 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-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-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-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2, MenuId, registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 import { 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 { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ctxReviewModeEnabled, ctxHasEditorModification, ctxIsGlobalEditingSession, ctxIsCurrentlyBeingModified } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
 
 class ChatEditingEditorAction extends Action2 {
     constructor(desc) {
@@ -54,8 +54,8 @@ class NavigateAction extends ChatEditingEditorAction {
                 ? 'chatEditor.action.navigateNext'
                 : 'chatEditor.action.navigatePrevious',
             title: next
-                ? ( localize2(5015, 'Go to Next Chat Edit'))
-                : ( localize2(5016, 'Go to Previous Chat Edit')),
+                ? ( localize2(5065, 'Go to Next Chat Edit'))
+                : ( localize2(5066, 'Go to Previous Chat Edit')),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -127,15 +127,15 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
         super({
             id,
             title: _keep
-                ? ( localize2(5017, 'Keep Chat Edits'))
-                : ( localize2(5018, 'Undo Chat Edits')),
+                ? ( localize2(5067, 'Keep Chat Edits'))
+                : ( localize2(5068, 'Undo Chat Edits')),
             shortTitle: _keep
-                ? ( localize2(5019, 'Keep'))
-                : ( localize2(5020, 'Undo')),
+                ? ( localize2(5069, 'Keep'))
+                : ( localize2(5070, 'Undo')),
             tooltip: _keep
-                ? ( localize2(5021, 'Keep Chat Edits in this File'))
-                : ( localize2(5022, 'Undo Chat Edits in this File')),
-            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
+                ? ( localize2(5071, 'Keep Chat Edits in this File'))
+                : ( localize2(5072, 'Undo Chat Edits in this File')),
+            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: _keep
                 ? Codicon.check
                 : Codicon.discard,
@@ -151,7 +151,7 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
                 id: MenuId.ChatEditingEditorContent,
                 group: 'a_resolve',
                 order: _keep ? 0 : 1,
-                when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ( ctxHasRequestInProgress.negate()))), (
+                when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ( ctxIsCurrentlyBeingModified.negate()))), (
                 ContextKeyExpr.and(ctxIsGlobalEditingSession, !_keep ? ctxReviewModeEnabled : undefined))))
             }
         });
@@ -184,8 +184,8 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? 'chatEditor.action.acceptHunk' : 'chatEditor.action.undoHunk',
-            title: _accept ? ( localize2(5023, 'Keep this Change')) : ( localize2(5024, 'Undo this Change')),
-            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
+            title: _accept ? ( localize2(5073, 'Keep this Change')) : ( localize2(5074, 'Undo this Change')),
+            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: _accept ? Codicon.check : Codicon.discard,
             f1: true,
             keybinding: {
@@ -219,7 +219,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.toggleDiff',
-            title: ( localize2(5025, 'Toggle Diff Editor for Chat Edits')),
+            title: ( localize2(5075, 'Toggle Diff Editor for Chat Edits')),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -251,9 +251,9 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.showAccessibleDiffView',
-            title: ( localize2(5026, 'Show Accessible Diff View for Chat Edits')),
+            title: ( localize2(5076, 'Show Accessible Diff View for Chat Edits')),
             f1: true,
-            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
+            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             keybinding: {
                 when: EditorContextKeys.focus,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -269,13 +269,13 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.reviewChanges',
-            title: ( localize2(5027, "Review")),
-            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
+            title: ( localize2(5077, "Review")),
+            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             menu: [{
                     id: MenuId.ChatEditingEditorContent,
                     group: 'a_resolve',
                     order: 3,
-                    when: ( ContextKeyExpr.and(( ctxReviewModeEnabled.negate()), ( ctxHasRequestInProgress.negate()))),
+                    when: ( ContextKeyExpr.and(( ctxReviewModeEnabled.negate()), ( ctxIsCurrentlyBeingModified.negate()))),
                 }]
         });
     }
@@ -288,9 +288,9 @@ class AcceptAllEditsAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: AcceptAllEditsAction.ID,
-            title: ( localize2(5028, 'Keep All Chat Edits')),
-            tooltip: ( localize2(5029, 'Keep All Chat Edits in this Session')),
-            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
+            title: ( localize2(5078, 'Keep All Chat Edits')),
+            tooltip: ( localize2(5079, 'Keep All Chat Edits in this Session')),
+            precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: Codicon.checkAll,
             f1: true,
             keybinding: {
@@ -308,7 +308,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? 'chatEditing.multidiff.acceptAllFiles' : 'chatEditing.multidiff.discardAllFiles',
-            title: accept ? ( localize(5030, 'Keep All Edits')) : ( localize(5031, 'Undo All Edits')),
+            title: accept ? ( localize(5080, 'Keep All Edits')) : ( localize(5081, '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(5032, "Navigation Status")),
+            title: ( localize(5082, "Navigation Status")),
             precondition: ( ContextKeyExpr.false()),
         },
         group: 'navigate',

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

@@ -64,7 +64,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
             }
             const response = this._entry.read(r)?.lastModifyingResponse.read(r);
             if (!response) {
-                return { message: ( localize(5038, "Working...")) };
+                return { message: ( localize(5089, "Working...")) };
             }
             const lastPart = observableFromEventOpts({ equalsFn: equals }, response.onDidChange, () => response.response.value)
                 .read(r)
@@ -77,7 +77,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                 return { message: lastPart.content };
             }
             else {
-                return { message: ( localize(5038, "Working...")) };
+                return { message: ( localize(5089, "Working...")) };
             }
         });
         const progressNode = createElement('div');
@@ -154,10 +154,10 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                 const { changeCount, activeIdx } = that._navigationBearings.read(r);
                                 if (changeCount > 0) {
                                     const n = activeIdx === -1 ? '1' : `${activeIdx + 1}`;
-                                    this.label.innerText = ( localize(5039, "{0} of {1}", n, changeCount));
+                                    this.label.innerText = ( localize(5090, "{0} of {1}", n, changeCount));
                                 }
                                 else {
-                                    this.label.innerText = ( localize(5040, "—"));
+                                    this.label.innerText = ( localize(5091, "—"));
                                 }
                                 this.updateTooltip();
                             }));
@@ -169,21 +169,21 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             }
                             let result;
                             if (changeCount === 1 && entriesCount === 1) {
-                                result = ( localize(5041, "1 change in 1 file"));
+                                result = ( localize(5092, "1 change in 1 file"));
                             }
                             else if (changeCount === 1) {
-                                result = ( localize(5042, "1 change in {0} files", entriesCount));
+                                result = ( localize(5093, "1 change in {0} files", entriesCount));
                             }
                             else if (entriesCount === 1) {
-                                result = ( localize(5043, "{0} changes in 1 file", changeCount));
+                                result = ( localize(5094, "{0} changes in 1 file", changeCount));
                             }
                             else {
-                                result = ( localize(5044, "{0} changes in {1} files", changeCount, entriesCount));
+                                result = ( localize(5095, "{0} changes in {1} files", changeCount, entriesCount));
                             }
                             if (!that._isBusy.get()) {
                                 return result;
                             }
-                            return localize(5045, "{0} - Working...", result);
+                            return localize(5096, "{0} - Working...", result);
                         }
                     });
                 }
@@ -232,7 +232,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             if (!kb) {
                                 return value;
                             }
-                            return localize(5046, "{0} ({1})", value, kb.getLabel());
+                            return localize(5097, "{0} ({1})", value, kb.getLabel());
                         }
                     });
                 }

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

@@ -1,7 +1,7 @@
 import { IReference } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { Location, TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { IResolvedTextEditorModel } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
@@ -38,6 +38,7 @@ export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditin
     }, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string | undefined, markerService: IMarkerService, modelService: IModelService, textModelService: ITextModelService, languageService: ILanguageService, configService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, _textFileService: ITextFileService, fileService: IFileService, undoRedoService: IUndoRedoService, instantiationService: IInstantiationService, aiEditTelemetryService: IAiEditTelemetryService);
     equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
     createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
+    hasModificationAt(location: Location): boolean;
     restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
     resetToInitialContent(): Promise<void>;
     protected _areOriginalAndModifiedIdentical(): Promise<boolean>;
@@ -47,4 +48,5 @@ export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditin
     protected _doAccept(): Promise<void>;
     protected _doReject(): Promise<void>;
     protected _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
+    private _shouldAutoSave;
 }

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

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
@@ -95,7 +96,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(5047, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(5098, "Chat Edits")));
             }
             else {
                 resourceFilter.clear();
@@ -121,6 +122,9 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             telemetryInfo: this._telemetryInfo
         };
     }
+    hasModificationAt(location) {
+        return ( location.uri.toString()) === ( this.modifiedModel.uri.toString()) && this._textModelChangeService.hasHunkAt(location.range);
+    }
     async restoreFromSnapshot(snapshot, restoreToDisk = true) {
         this._stateObs.set(snapshot.state, undefined);
         await this._textModelChangeService.resetDocumentValues(snapshot.original, restoreToDisk ? snapshot.current : undefined);
@@ -137,7 +141,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(5048, "Chat Edit: '{0}'", request.message.text)) : ( localize(5049, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5099, "Chat Edit: '{0}'", request.message.text)) : ( localize(5100, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {
@@ -154,7 +158,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
                 this._rewriteRatioObs.set(1, tx);
             }
         });
-        if (isLastEdits) {
+        if (isLastEdits && this._shouldAutoSave()) {
             await this._textFileService.save(this.modifiedModel.uri, {
                 reason: SaveReason.AUTO,
                 skipSaveParticipants: true,
@@ -199,6 +203,9 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         const diffInfo = this._textModelChangeService.diffInfo;
         return this._instantiationService.createInstance(ChatEditingCodeEditorIntegration, this, codeEditor, diffInfo, false);
     }
+    _shouldAutoSave() {
+        return this.modifiedURI.scheme !== Schemas.untitled;
+    }
 };
 ChatEditingModifiedDocumentEntry = ( __decorate([
     ( __param(5, IMarkerService)),

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

@@ -3,7 +3,7 @@ import { Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { Location, TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
@@ -62,6 +62,7 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     protected readonly _userEditScheduler: RunOnceScheduler;
     constructor(modifiedURI: URI, _telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, configService: IConfigurationService, _fileConfigService: IFilesConfigurationService, _chatService: IChatService, _fileService: IFileService, _undoRedoService: IUndoRedoService, _instantiationService: IInstantiationService, _aiEditTelemetryService: IAiEditTelemetryService);
     dispose(): void;
+    abstract hasModificationAt(location: Location): boolean;
     acquire(): this;
     enableReviewModeUntilSettled(): void;
     updateTelemetryInfo(telemetryInfo: IModifiedEntryTelemetryInfo): void;

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

@@ -42,7 +42,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(5050, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(5101, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static { AbstractChatEditingModifiedFileEntry_1 = this; }
     static { this.scheme = 'modified-file-entry'; }
@@ -119,10 +119,10 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._store.add(autorun(r => {
             const inProgress = this._lastModifyingResponseInProgressObs.read(r);
             if (inProgress === false && !this.reviewMode.read(r)) {
-                const acceptTimeout = this._autoAcceptTimeout.get() * 1000;
+                const acceptTimeout = this._autoAcceptTimeout.read(undefined) * 1000;
                 const future = Date.now() + acceptTimeout;
                 const update = () => {
-                    const reviewMode = this.reviewMode.get();
+                    const reviewMode = this.reviewMode.read(undefined);
                     if (reviewMode) {
                         this._autoAcceptCtrl.set(undefined, undefined);
                         return;
@@ -203,6 +203,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
                 editDeltaInfo: ( new EditDeltaInfo(action.linesAdded, action.linesRemoved, -1, -1)),
                 feature: this._telemetryInfo.feature,
                 languageId: action.languageId,
+                source: undefined,
             });
         }
         this._chatService.notifyUserAction({

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

@@ -1,7 +1,7 @@
 import { IReference } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ITransaction, IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { Location, TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
 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";
@@ -75,6 +75,7 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     constructor(modifiedResourceRef: IReference<IResolvedNotebookEditorModel>, originalResourceRef: IReference<IResolvedNotebookEditorModel>, _multiDiffEntryDelegate: {
         collapse: (transaction: ITransaction | undefined) => void;
     }, transientOptions: TransientOptions | undefined, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string, configurationService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, fileService: IFileService, instantiationService: IInstantiationService, textModelService: ITextModelService, modelService: IModelService, undoRedoService: IUndoRedoService, notebookEditorWorkerService: INotebookEditorWorkerService, loggingService: INotebookLoggingService, notebookResolver: INotebookEditorModelResolverService, aiEditTelemetryService: IAiEditTelemetryService);
+    hasModificationAt(location: Location): boolean;
     initializeModelsFromDiffImpl(cellsDiffInfo: CellDiffInfo[]): void;
     private computeRequestId;
     initializeModelsFromDiff(): Promise<void>;