@codingame/monaco-vscode-chat-service-override 23.2.2 → 24.1.0

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

@@ -8,19 +8,18 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
-import { resolveCommandsContext } from '@codingame/monaco-vscode-0b011daf-0f15-57de-bd5b-8953592c556c-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { EditorResourceAccessor, SideBySideEditor, TEXT_DIFF_EDITOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { MultiDiffEditorInput } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-api/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 { ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, parseChatMultiDiffUri } 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 { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ctxReviewModeEnabled, ctxHasEditorModification, ctxIsGlobalEditingSession, ctxIsCurrentlyBeingModified, ctxCursorInChangeRange } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
 
 class ChatEditingEditorAction extends Action2 {
@@ -55,8 +54,8 @@ class NavigateAction extends ChatEditingEditorAction {
                 ? 'chatEditor.action.navigateNext'
                 : 'chatEditor.action.navigatePrevious',
             title: next
-                ? ( localize2(5159, 'Go to Next Chat Edit'))
-                : ( localize2(5160, 'Go to Previous Chat Edit')),
+                ? ( localize2(5219, 'Go to Next Chat Edit'))
+                : ( localize2(5220, 'Go to Previous Chat Edit')),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -128,14 +127,14 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
         super({
             id,
             title: _keep
-                ? ( localize2(5161, 'Keep Chat Edits'))
-                : ( localize2(5162, 'Undo Chat Edits')),
+                ? ( localize2(5221, 'Keep Chat Edits'))
+                : ( localize2(5222, 'Undo Chat Edits')),
             shortTitle: _keep
-                ? ( localize2(5163, 'Keep'))
-                : ( localize2(5164, 'Undo')),
+                ? ( localize2(5223, 'Keep'))
+                : ( localize2(5224, 'Undo')),
             tooltip: _keep
-                ? ( localize2(5165, 'Keep Chat Edits in this File'))
-                : ( localize2(5166, 'Undo Chat Edits in this File')),
+                ? ( localize2(5225, 'Keep Chat Edits in this File'))
+                : ( localize2(5226, 'Undo Chat Edits in this File')),
             precondition: ( ContextKeyExpr.and(ctxIsGlobalEditingSession, ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: _keep
                 ? Codicon.check
@@ -186,8 +185,8 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? acceptHunkId : undoHunkId,
-            title: _accept ? ( localize2(5167, 'Keep this Change')) : ( localize2(5168, 'Undo this Change')),
-            shortTitle: _accept ? ( localize2(5169, 'Keep')) : ( localize2(5170, 'Undo')),
+            title: _accept ? ( localize2(5227, 'Keep this Change')) : ( localize2(5228, 'Undo this Change')),
+            shortTitle: _accept ? ( localize2(5229, 'Keep')) : ( localize2(5230, 'Undo')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             f1: true,
             keybinding: {
@@ -233,7 +232,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.toggleDiff',
-            title: ( localize2(5171, 'Toggle Diff Editor for Chat Edits')),
+            title: ( localize2(5231, 'Toggle Diff Editor for Chat Edits')),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -265,7 +264,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.showAccessibleDiffView',
-            title: ( localize2(5172, 'Show Accessible Diff View for Chat Edits')),
+            title: ( localize2(5232, 'Show Accessible Diff View for Chat Edits')),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             keybinding: {
@@ -283,7 +282,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.reviewChanges',
-            title: ( localize2(5173, "Review")),
+            title: ( localize2(5233, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             menu: [{
                     id: MenuId.ChatEditingEditorContent,
@@ -302,8 +301,8 @@ class AcceptAllEditsAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: AcceptAllEditsAction.ID,
-            title: ( localize2(5174, 'Keep All Chat Edits')),
-            tooltip: ( localize2(5175, 'Keep All Chat Edits in this Session')),
+            title: ( localize2(5234, 'Keep All Chat Edits')),
+            tooltip: ( localize2(5235, 'Keep All Chat Edits in this Session')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: Codicon.checkAll,
             f1: true,
@@ -322,7 +321,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? 'chatEditing.multidiff.acceptAllFiles' : 'chatEditing.multidiff.discardAllFiles',
-            title: accept ? ( localize(5176, 'Keep All Edits')) : ( localize(5177, 'Undo All Edits')),
+            title: accept ? ( localize(5236, 'Keep All Edits')) : ( localize(5237, 'Undo All Edits')),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -347,12 +346,16 @@ class MultiDiffAcceptDiscardAction extends Action2 {
         if (!(editor instanceof MultiDiffEditorInput) || !editor.resource) {
             return;
         }
-        const session = chatEditingService.getEditingSession(LocalChatSessionUri.forSession(editor.resource.authority));
-        if (this.accept) {
-            await session?.accept();
-        }
-        else {
-            await session?.reject();
+        const { chatSessionResource } = parseChatMultiDiffUri(editor.resource);
+        const session = chatEditingService.getEditingSession(chatSessionResource);
+        if (session) {
+            if (this.accept) {
+                await session.accept();
+            }
+            else {
+                await session.reject();
+            }
+            editorService.closeEditor({ editor, groupId: groupContext.group.id });
         }
     }
 }
@@ -380,7 +383,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(5178, "Navigation Status")),
+            title: ( localize(5238, "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-09f99a3e-bf90-51d4-ab34-acea412359d2-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
+import { EditorGroupView } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorGroupView';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -64,7 +64,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
             }
             const response = this._entry.read(r)?.lastModifyingResponse.read(r);
             if (!response) {
-                return { message: ( localize(5186, "Working...")) };
+                return { message: ( localize(5246, "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(5186, "Working...")) };
+                return { message: ( localize(5246, "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(5187, "{0} of {1}", n, changeCount));
+                                    this.label.innerText = ( localize(5247, "{0} of {1}", n, changeCount));
                                 }
                                 else {
-                                    this.label.innerText = ( localize(5188, "—"));
+                                    this.label.innerText = ( localize(5248, "—"));
                                 }
                                 this.updateTooltip();
                             }));
@@ -169,21 +169,21 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             }
                             let result;
                             if (changeCount === 1 && entriesCount === 1) {
-                                result = ( localize(5189, "1 change in 1 file"));
+                                result = ( localize(5249, "1 change in 1 file"));
                             }
                             else if (changeCount === 1) {
-                                result = ( localize(5190, "1 change in {0} files", entriesCount));
+                                result = ( localize(5250, "1 change in {0} files", entriesCount));
                             }
                             else if (entriesCount === 1) {
-                                result = ( localize(5191, "{0} changes in 1 file", changeCount));
+                                result = ( localize(5251, "{0} changes in 1 file", changeCount));
                             }
                             else {
-                                result = ( localize(5192, "{0} changes in {1} files", changeCount, entriesCount));
+                                result = ( localize(5252, "{0} changes in {1} files", changeCount, entriesCount));
                             }
                             if (!that._isBusy.get()) {
                                 return result;
                             }
-                            return localize(5193, "{0} - Working...", result);
+                            return localize(5253, "{0} - Working...", result);
                         }
                     });
                 }
@@ -232,7 +232,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             if (!kb) {
                                 return value;
                             }
-                            return localize(5194, "{0} ({1})", value, kb.getLabel());
+                            return localize(5254, "{0} ({1})", value, kb.getLabel());
                         }
                     });
                 }
@@ -299,7 +299,7 @@ let ChatEditingOverlayController = class ChatEditingOverlayController {
                 return false;
             }
             const chatModel = chatService.getSession(session.chatSessionResource);
-            return chatModel.requestInProgressObs.read(r);
+            return chatModel.requestInProgress.read(r);
         });
         this._store.add(autorun(r => {
             const data = sessionAndEntry.read(r);

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

@@ -1,6 +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 { IDocumentDiff } from "../../../../../editor/common/diff/documentDiffProvider.js";
 import { Location, TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
@@ -20,7 +21,7 @@ import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workben
 import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
 interface IMultiDiffEntryDelegate {
@@ -50,8 +51,9 @@ export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditin
     readonly originalURI: URI;
     private readonly _textModelChangeService;
     constructor(resourceRef: IReference<IResolvedTextEditorModel>, _multiDiffEntryDelegate: IMultiDiffEntryDelegate, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string | undefined, markerService: IMarkerService, modelService: IModelService, textModelService: ITextModelService, languageService: ILanguageService, configService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, _textFileService: ITextFileService, fileService: IFileService, undoRedoService: IUndoRedoService, instantiationService: IInstantiationService, aiEditTelemetryService: IAiEditTelemetryService, _editorWorkerService: IEditorWorkerService);
+    getDiffInfo(): Promise<IDocumentDiff>;
     equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
-    createSnapshot(sessionId: string, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
+    createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
     getCurrentContents(): string;
     hasModificationAt(location: Location): boolean;
     restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;

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

@@ -65,7 +65,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         this._editorWorkerService = _editorWorkerService;
         this._docFileEditorModel = this._register(resourceRef).object;
         this.modifiedModel = resourceRef.object.textEditorModel;
-        this.originalURI = ChatEditingTextModelContentProvider.getFileURI(telemetryInfo.sessionId, this.entryId, this.modifiedURI.path);
+        this.originalURI = ChatEditingTextModelContentProvider.getFileURI(telemetryInfo.sessionResource, this.entryId, this.modifiedURI.path);
         this.initialContent = initialContent ?? this.modifiedModel.getValue();
         const docSnapshot = this.originalModel = this._register(modelService.createModel(createTextBufferFactoryFromSnapshot(initialContent !== undefined ? stringToSnapshot(initialContent) : this.modifiedModel.createSnapshot()), languageService.createById(this.modifiedModel.getLanguageId()), this.originalURI, false));
         this._textModelChangeService = this._register(instantiationService.createInstance(ChatEditingTextModelChangeService, this.originalModel, this.modifiedModel, this._stateObs, () => this._isExternalEditInProgress));
@@ -103,13 +103,16 @@ 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(5195, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(5255, "Chat Edits")));
             }
             else {
                 resourceFilter.clear();
             }
         }));
     }
+    getDiffInfo() {
+        return this._textModelChangeService.getDiffInfo();
+    }
     equalsSnapshot(snapshot) {
         return !!snapshot &&
             ( this.modifiedURI.toString()) === ( snapshot.resource.toString()) &&
@@ -118,11 +121,11 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             this.modifiedModel.getValue() === snapshot.current &&
             this.state.get() === snapshot.state;
     }
-    createSnapshot(sessionId, requestId, undoStop) {
+    createSnapshot(chatSessionResource, requestId, undoStop) {
         return {
             resource: this.modifiedURI,
             languageId: this.modifiedModel.getLanguageId(),
-            snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(sessionId, requestId, undoStop, this.modifiedURI.path),
+            snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(chatSessionResource, requestId, undoStop, this.modifiedURI.path),
             original: this.originalModel.getValue(),
             current: this.modifiedModel.getValue(),
             state: this.state.get(),
@@ -151,7 +154,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(5196, "Chat Edit: '{0}'", request.message.text)) : ( localize(5197, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5256, "Chat Edit: '{0}'", request.message.text)) : ( localize(5257, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {
@@ -201,7 +204,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         }
         else {
             this._textModelChangeService.undo();
-            if (this._textModelChangeService.allEditsAreFromUs && isTextFileEditorModel(this._docFileEditorModel)) {
+            if (this._textModelChangeService.allEditsAreFromUs && isTextFileEditorModel(this._docFileEditorModel) && this._shouldAutoSave()) {
                 await this._docFileEditorModel.save({ reason: SaveReason.EXPLICIT, skipSaveParticipants: true });
             }
             this._multiDiffEntryDelegate.collapse(undefined);

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

@@ -14,7 +14,7 @@ import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/
 import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/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 {
@@ -103,7 +103,7 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     acceptStreamingEditsEnd(): Promise<void>;
     protected abstract _areOriginalAndModifiedIdentical(): Promise<boolean>;
     protected _resetEditsState(tx: ITransaction | undefined): void;
-    abstract createSnapshot(sessionId: string, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
+    abstract createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
     abstract equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
     abstract restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
     abstract resetToInitialContent(): Promise<void>;

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

@@ -6,6 +6,7 @@ import { Disposable, DisposableMap, toDisposable, MutableDisposable } from '@cod
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { clamp } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { EditDeltaInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 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';
@@ -25,10 +26,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
-import { EditDeltaInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
 import { ModifiedFileEntryState, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -43,7 +42,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(5198, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(5258, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static { AbstractChatEditingModifiedFileEntry_1 = this; }
     static { this.scheme = 'modified-file-entry'; }
@@ -155,6 +154,9 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         return this;
     }
     enableReviewModeUntilSettled() {
+        if (this.state.get() !== ModifiedFileEntryState.Modified) {
+            return;
+        }
         this._reviewModeTempObs.set(true, undefined);
         const cleanup = autorun(r => {
             const resetConfig = this.state.read(r) !== ModifiedFileEntryState.Modified;
@@ -226,7 +228,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
             modelId: this._telemetryInfo.modelId,
             modeId: this._telemetryInfo.modeId,
             command: this._telemetryInfo.command,
-            sessionResource: LocalChatSessionUri.forSession(this._telemetryInfo.sessionId),
+            sessionResource: this._telemetryInfo.sessionResource,
             requestId: this._telemetryInfo.requestId,
             result: this._telemetryInfo.result
         });

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

@@ -12,14 +12,14 @@ import { IUndoRedoElement } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service";
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
-import { CellDiffInfo } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { CellDiffInfo } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { ICellEditOperation, IResolvedNotebookEditorModel, NotebookTextModelChangedEvent, TransientOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
 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-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/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";
@@ -106,7 +106,7 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     private _applyEdits;
     private _applyEditsSync;
     getCurrentSnapshot(): string;
-    createSnapshot(sessionId: string, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
+    createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
     equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
     restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
     resetToInitialContent(): Promise<void>;

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

@@ -25,11 +25,11 @@ import { UndoRedoElementType } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 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-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { SnapshotContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/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 { computeDiff } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
 import { INotebookLoggingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
@@ -71,7 +71,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             const configurationServie = accessor.get(IConfigurationService);
             const resourceRef = await resolver.resolve(uri);
             const notebook = resourceRef.object.notebook;
-            const originalUri = getNotebookSnapshotFileURI(telemetryInfo.sessionId, telemetryInfo.requestId, generateUuid(), notebook.uri.scheme === Schemas.untitled ? `/${notebook.uri.path}` : notebook.uri.path, notebook.viewType);
+            const originalUri = getNotebookSnapshotFileURI(telemetryInfo.sessionResource, telemetryInfo.requestId, generateUuid(), notebook.uri.scheme === Schemas.untitled ? `/${notebook.uri.path}` : notebook.uri.path, notebook.viewType);
             const [options, buffer] = await Promise.all([
                 notebookService.withNotebookDataProvider(resourceRef.object.notebook.notebookType),
                 notebookService.createNotebookTextDocumentSnapshot(notebook.uri, SnapshotContext.Backup, CancellationToken.None).then(s => streamToBuffer(s))
@@ -317,16 +317,6 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
                     break;
                 }
                 case NotebookCellsChangeType.OutputItem: {
-                    const index = getCorrespondingOriginalCellIndex(event.index, this._cellsDiffInfo.get());
-                    if (typeof index === 'number') {
-                        const edit = {
-                            editType: CellEditType.OutputItems,
-                            outputId: event.outputId,
-                            append: event.append,
-                            items: event.outputItems
-                        };
-                        this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, false);
-                    }
                     break;
                 }
                 case NotebookCellsChangeType.Move: {
@@ -406,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(5199, "Chat Edit: '{0}'", request.message.text)) : ( localize(5200, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5259, "Chat Edit: '{0}'", request.message.text)) : ( localize(5260, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
@@ -775,11 +765,11 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     getCurrentSnapshot() {
         return createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
     }
-    createSnapshot(sessionId, requestId, undoStop) {
+    createSnapshot(chatSessionResource, requestId, undoStop) {
         return {
             resource: this.modifiedURI,
             languageId: SnapshotLanguageId,
-            snapshotUri: getNotebookSnapshotFileURI(sessionId, requestId, undoStop, this.modifiedURI.path, this.modifiedModel.viewType),
+            snapshotUri: getNotebookSnapshotFileURI(chatSessionResource, requestId, undoStop, this.modifiedURI.path, this.modifiedModel.viewType),
             original: createSnapshot(this.originalModel, this.transientOptions, this.configurationService),
             current: createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService),
             state: this.state.get(),

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

@@ -115,3 +115,4 @@ export interface IChatEditingTimelineState {
     readonly currentEpoch: number;
     readonly epochCounter: number;
 }
+export declare function getKeyForChatSessionResource(chatSessionResource: URI): string;

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

@@ -1,4 +1,6 @@
 
+import { StringSHA1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 
 var FileOperationType;
 (function (FileOperationType) {
@@ -8,5 +10,14 @@ var FileOperationType;
     FileOperationType["TextEdit"] = "textEdit";
     FileOperationType["NotebookEdit"] = "notebookEdit";
 })(FileOperationType || (FileOperationType = {}));
+function getKeyForChatSessionResource(chatSessionResource) {
+    const sessionId = LocalChatSessionUri.parseLocalSessionId(chatSessionResource);
+    if (sessionId) {
+        return sessionId;
+    }
+    const sha = ( new StringSHA1());
+    sha.update(( chatSessionResource.toString()));
+    return sha.digest();
+}
 
-export { FileOperationType };
+export { FileOperationType, getKeyForChatSessionResource };

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

@@ -14,12 +14,12 @@ import { IDecorationsService } from "@codingame/monaco-vscode-api/vscode/vs/work
 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 { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
-import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
 import { IMultiDiffSourceResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { IChatEditingSession, IChatRelatedFile, IChatRelatedFilesProvider } 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 { ChatModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 export declare class ChatEditingService extends Disposable implements IChatEditingService {
     private readonly _instantiationService;
@@ -32,15 +32,14 @@ export declare class ChatEditingService extends Disposable implements IChatEditi
     _serviceBrand: undefined;
     private readonly _sessionsObs;
     readonly editingSessionsObs: IObservable<readonly IChatEditingSession[]>;
-    private _restoringEditingSession;
     private _chatRelatedFilesProviders;
     constructor(_instantiationService: IInstantiationService, multiDiffSourceResolverService: IMultiDiffSourceResolverService, textModelService: ITextModelService, contextKeyService: IContextKeyService, _chatService: IChatService, _editorService: IEditorService, decorationsService: IDecorationsService, _fileService: IFileService, lifecycleService: ILifecycleService, storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, productService: IProductService, notebookService: INotebookService, _configurationService: IConfigurationService);
     dispose(): void;
-    startOrContinueGlobalEditingSession(chatModel: ChatModel, waitForRestore?: boolean): Promise<IChatEditingSession>;
+    startOrContinueGlobalEditingSession(chatModel: ChatModel): IChatEditingSession;
     private _lookupEntry;
     getEditingSession(chatSessionResource: URI): IChatEditingSession | undefined;
-    createEditingSession(chatModel: ChatModel, global?: boolean): Promise<IChatEditingSession>;
-    transferEditingSession(chatModel: ChatModel, session: IChatEditingSession): Promise<IChatEditingSession>;
+    createEditingSession(chatModel: ChatModel, global?: boolean): IChatEditingSession;
+    transferEditingSession(chatModel: ChatModel, session: IChatEditingSession): IChatEditingSession;
     private _createEditingSession;
     private installAutoApplyObserver;
     private observerEditsInResponse;