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

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

@@ -29,14 +29,14 @@ 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 { MultiDiffEditorItem } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
+import { MultiDiffEditorItem } 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 { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { chatEditingAgentSupportsReadonlyReferencesContextKey, ChatEditingSessionState, ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, parseChatMultiDiffUri, chatEditingResourceContextKey, inChatEditingSessionContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { isCellTextEditOperationArray } 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 { ChatEditorInput } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingSession } from './chatEditingSession.js';
 import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
@@ -97,7 +97,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: 'join.chatEditingSession',
-                label: ( localize(5201, "Saving chat edits history"))
+                label: ( localize(5261, "Saving chat edits history"))
             });
         }));
     }
@@ -105,16 +105,8 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         dispose(this._sessionsObs.get());
         super.dispose();
     }
-    async startOrContinueGlobalEditingSession(chatModel, waitForRestore = true) {
-        if (waitForRestore) {
-            await this._restoringEditingSession;
-        }
-        const session = this.getEditingSession(chatModel.sessionResource);
-        if (session) {
-            return session;
-        }
-        const result = await this.createEditingSession(chatModel, true);
-        return result;
+    startOrContinueGlobalEditingSession(chatModel) {
+        return this.getEditingSession(chatModel.sessionResource) || this.createEditingSession(chatModel, true);
     }
     _lookupEntry(uri) {
         for (const item of Iterable.concat(this.editingSessionsObs.get())) {
@@ -129,16 +121,15 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         return this.editingSessionsObs.get()
             .find(candidate => isEqual(candidate.chatSessionResource, chatSessionResource));
     }
-    async createEditingSession(chatModel, global = false) {
+    createEditingSession(chatModel, global = false) {
         return this._createEditingSession(chatModel, global, undefined);
     }
-    async transferEditingSession(chatModel, session) {
+    transferEditingSession(chatModel, session) {
         return this._createEditingSession(chatModel, session.isGlobalEditingSession, session);
     }
-    async _createEditingSession(chatModel, global, initFrom) {
+    _createEditingSession(chatModel, global, initFrom) {
         assertType(this.getEditingSession(chatModel.sessionResource) === undefined, 'CANNOT have more than one editing session per chat session');
-        const session = this._instantiationService.createInstance(ChatEditingSession, chatModel.sessionId, chatModel.sessionResource, global, this._lookupEntry.bind(this));
-        await session.init(initFrom);
+        const session = this._instantiationService.createInstance(ChatEditingSession, chatModel.sessionResource, global, this._lookupEntry.bind(this), initFrom);
         const list = this._sessionsObs.get();
         const removeSession = list.unshift(session);
         const store = ( new DisposableStore());
@@ -155,7 +146,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
     installAutoApplyObserver(session, chatModel) {
         if (!chatModel) {
             throw ( new ErrorNoTelemetry(
-                `Edit session was created for a non-existing chat session: ${session.chatSessionId}`
+                `Edit session was created for a non-existing chat session: ${session.chatSessionResource}`
             ));
         }
         const observerDisposables = ( new DisposableStore());
@@ -189,7 +180,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
                 if (this.notebookService.getNotebookTextModel(uri) || uri.scheme === Schemas.untitled || (await this._fileService.exists(uri).catch(() => false))) {
                     const activeUri = this._editorService.activeEditorPane?.input.resource;
                     const inactive = editorDidChange
-                        || this._editorService.activeEditorPane?.input instanceof ChatEditorInput && this._editorService.activeEditorPane.input.sessionId === session.chatSessionId
+                        || this._editorService.activeEditorPane?.input instanceof ChatEditorInput && isEqual(this._editorService.activeEditorPane.input.sessionResource, session.chatSessionResource)
                         || Boolean(activeUri && session.entries.get().find(entry => isEqual(activeUri, entry.modifiedURI)));
                     this._editorService.openEditor({ resource: uri, options: { inactive, preserveFocus: true, pinned: true } });
                 }
@@ -332,7 +323,7 @@ class ChatDecorationsProvider extends Disposable {
     constructor(_sessions) {
         super();
         this._sessions = _sessions;
-        this.label = ( localize(5202, "Chat Editing"));
+        this.label = ( localize(5262, "Chat Editing"));
         this._currentEntries = derived(this, (r) => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -371,7 +362,7 @@ class ChatDecorationsProvider extends Disposable {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: ( localize(5203, "Pending changes from chat")),
+                tooltip: ( localize(5263, "Pending changes from chat")),
                 bubble: true
             };
         }
@@ -389,7 +380,7 @@ let ChatEditingMultiDiffSourceResolver = class ChatEditingMultiDiffSourceResolve
     async resolveDiffSource(uri) {
         const parsed = parseChatMultiDiffUri(uri);
         const thisSession = derived(this, r => {
-            return this._editingSessionsObs.read(r).find(candidate => candidate.chatSessionId === parsed.chatSessionId);
+            return this._editingSessionsObs.read(r).find(candidate => isEqual(candidate.chatSessionResource, parsed.chatSessionResource));
         });
         return this._instantiationService.createInstance(ChatEditingMultiDiffSource, thisSession, parsed.showPreviousChanges);
     }

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

@@ -14,13 +14,11 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
-import { ChatEditingSessionState, IChatEditingSession, IModifiedFileEntry, IStreamingEdits } 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 { ChatEditingSessionState, IChatEditingSession, IEditSessionEntryDiff, IModifiedFileEntry, IStreamingEdits } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatProgress } 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";
 import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
 export declare class ChatEditingSession extends Disposable implements IChatEditingSession {
-    readonly chatSessionId: string;
     readonly chatSessionResource: URI;
     readonly isGlobalEditingSession: boolean;
     private _lookupExternalEntry;
@@ -31,7 +29,6 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     readonly _bulkEditService: IBulkEditService;
     private readonly _editorGroupsService;
     private readonly _editorService;
-    private readonly _chatService;
     private readonly _notebookService;
     private readonly _accessibilitySignalService;
     private readonly _logService;
@@ -50,23 +47,28 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
      */
     private readonly _externalEditOperations;
     private readonly _entriesObs;
-    get entries(): IObservable<readonly IModifiedFileEntry[]>;
+    readonly entries: IObservable<readonly IModifiedFileEntry[]>;
     private _editorPane;
     get state(): IObservable<ChatEditingSessionState>;
     readonly canUndo: IObservable<boolean>;
     readonly canRedo: IObservable<boolean>;
+    get requestDisablement(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel").IChatRequestDisablement[]>;
     private readonly _onDidDispose;
     get onDidDispose(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
-    constructor(chatSessionId: string, chatSessionResource: URI, isGlobalEditingSession: boolean, _lookupExternalEntry: (uri: URI) => AbstractChatEditingModifiedFileEntry | undefined, _instantiationService: IInstantiationService, _modelService: IModelService, _languageService: ILanguageService, _textModelService: ITextModelService, _bulkEditService: IBulkEditService, _editorGroupsService: IEditorGroupsService, _editorService: IEditorService, _chatService: IChatService, _notebookService: INotebookService, _accessibilitySignalService: IAccessibilitySignalService, _logService: ILogService, configurationService: IConfigurationService);
+    constructor(chatSessionResource: URI, isGlobalEditingSession: boolean, _lookupExternalEntry: (uri: URI) => AbstractChatEditingModifiedFileEntry | undefined, transferFrom: IChatEditingSession | undefined, _instantiationService: IInstantiationService, _modelService: IModelService, _languageService: ILanguageService, _textModelService: ITextModelService, _bulkEditService: IBulkEditService, _editorGroupsService: IEditorGroupsService, _editorService: IEditorService, _notebookService: INotebookService, _accessibilitySignalService: IAccessibilitySignalService, _logService: ILogService, configurationService: IConfigurationService);
     private _getTimelineDelegate;
-    init(transferFrom?: IChatEditingSession): Promise<void>;
+    private _init;
     private _getEntry;
     getEntry(uri: URI): IModifiedFileEntry | undefined;
     readEntry(uri: URI, reader: IReader | undefined): IModifiedFileEntry | undefined;
     storeState(): Promise<void>;
     private _getStoredState;
-    getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService").IEditSessionEntryDiff | undefined> | undefined;
-    getEntryDiffBetweenRequests(uri: URI, startRequestId: string, stopRequestId: string): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService").IEditSessionEntryDiff | undefined>;
+    getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined> | undefined;
+    getEntryDiffBetweenRequests(uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined>;
+    getDiffsForFilesInSession(): IObservable<readonly IEditSessionEntryDiff[]>;
+    getDiffForSession(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService").IEditSessionDiffStats>;
+    getDiffsForFilesInRequest(requestId: string): IObservable<readonly IEditSessionEntryDiff[]>;
+    hasEditsInRequest(requestId: string, reader?: IReader): boolean;
     createSnapshot(requestId: string, undoStop: string | undefined): void;
     getSnapshotContents(requestId: string, uri: URI, stopId: string | undefined): Promise<VSBuffer | undefined>;
     getSnapshotModel(requestId: string, undoStop: string | undefined, snapshotUri: URI): Promise<ITextModel | null>;
@@ -83,7 +85,7 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     dispose(): void;
     private get isDisposed();
     startStreamingEdits(resource: URI, responseModel: IChatResponseModel, inUndoStop: string | undefined): IStreamingEdits;
-    startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[]): Promise<IChatProgress[]>;
+    startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[], undoStopId: string): Promise<IChatProgress[]>;
     stopExternalEdits(responseModel: IChatResponseModel, operationId: number): Promise<IChatProgress[]>;
     undoInteraction(): Promise<void>;
     redoInteraction(): Promise<void>;

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

@@ -13,7 +13,6 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { hasKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
@@ -29,11 +28,10 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 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 { MultiDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { ChatEditingSessionState, ModifiedFileEntryState, getMultiDiffSourceUri, 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 { ChatEditingSessionState, ModifiedFileEntryState, getMultiDiffSourceUri, chatEditingSessionIsReady, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatEditingCheckpointTimelineImpl } from './chatEditingCheckpointTimelineImpl.js';
 import { ChatEditingModifiedDocumentEntry } from './chatEditingModifiedDocumentEntry.js';
@@ -43,7 +41,7 @@ import { FileOperationType } from './chatEditingOperations.js';
 import { ChatEditingSessionStorage } from './chatEditingSessionStorage.js';
 import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 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';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
 var ChatEditingSession_1;
@@ -77,7 +75,7 @@ class ThrottledSequencer extends Sequencer {
         });
     }
 }
-function createOpeningEditCodeBlock(uri, isNotebook) {
+function createOpeningEditCodeBlock(uri, isNotebook, undoStopId) {
     return [
         {
             kind: 'markdownContent',
@@ -86,7 +84,8 @@ function createOpeningEditCodeBlock(uri, isNotebook) {
         {
             kind: 'codeblockUri',
             uri,
-            isEdit: true
+            isEdit: true,
+            undoStopId
         },
         {
             kind: 'markdownContent',
@@ -110,19 +109,18 @@ function createOpeningEditCodeBlock(uri, isNotebook) {
     ];
 }
 let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends Disposable {
-    get entries() {
-        return this._entriesObs;
-    }
     get state() {
         return this._state;
     }
+    get requestDisablement() {
+        return this._timeline.requestDisablement;
+    }
     get onDidDispose() {
         this._assertNotDisposed();
         return this._onDidDispose.event;
     }
-    constructor(chatSessionId, chatSessionResource, isGlobalEditingSession, _lookupExternalEntry, _instantiationService, _modelService, _languageService, _textModelService, _bulkEditService, _editorGroupsService, _editorService, _chatService, _notebookService, _accessibilitySignalService, _logService, configurationService) {
+    constructor(chatSessionResource, isGlobalEditingSession, _lookupExternalEntry, transferFrom, _instantiationService, _modelService, _languageService, _textModelService, _bulkEditService, _editorGroupsService, _editorService, _notebookService, _accessibilitySignalService, _logService, configurationService) {
         super();
-        this.chatSessionId = chatSessionId;
         this.chatSessionResource = chatSessionResource;
         this.isGlobalEditingSession = isGlobalEditingSession;
         this._lookupExternalEntry = _lookupExternalEntry;
@@ -133,7 +131,6 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         this._bulkEditService = _bulkEditService;
         this._editorGroupsService = _editorGroupsService;
         this._editorService = _editorService;
-        this._chatService = _chatService;
         this._notebookService = _notebookService;
         this._accessibilitySignalService = _accessibilitySignalService;
         this._logService = _logService;
@@ -144,18 +141,24 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         this._streamingEditLocks = ( new SequencerByKey());
         this._externalEditOperations = ( new Map());
         this._entriesObs = observableValue(this, []);
+        this.entries = derived(reader => {
+            const state = this._state.read(reader);
+            if (state === ChatEditingSessionState.Disposed || state === ChatEditingSessionState.Initial) {
+                return [];
+            }
+            else {
+                return this._entriesObs.read(reader);
+            }
+        });
         this._onDidDispose = ( new Emitter());
-        this._timeline = this._instantiationService.createInstance(ChatEditingCheckpointTimelineImpl, chatSessionId, this._getTimelineDelegate());
+        this._timeline = this._instantiationService.createInstance(ChatEditingCheckpointTimelineImpl, chatSessionResource, this._getTimelineDelegate());
         this.canRedo = ( this._timeline.canRedo.map(
             (hasHistory, reader) => hasHistory && this._state.read(reader) === ChatEditingSessionState.Idle
         ));
         this.canUndo = ( this._timeline.canUndo.map(
             (hasHistory, reader) => hasHistory && this._state.read(reader) === ChatEditingSessionState.Idle
         ));
-        this._register(autorun(reader => {
-            const disabled = this._timeline.requestDisablement.read(reader);
-            this._chatService.getSession(this.chatSessionResource)?.setDisabledRequests(disabled);
-        }));
+        this._init(transferFrom);
     }
     _getTimelineDelegate() {
         return {
@@ -195,26 +198,31 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
             }
         };
     }
-    async init(transferFrom) {
-        let restoredSessionState = await this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionId).restoreState();
-        if (!restoredSessionState && transferFrom instanceof ChatEditingSession_1) {
-            restoredSessionState = transferFrom._getStoredState(this.chatSessionId);
+    async _init(transferFrom) {
+        const storage = this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionResource);
+        let restoredSessionState;
+        if (transferFrom instanceof ChatEditingSession_1) {
+            restoredSessionState = transferFrom._getStoredState(this.chatSessionResource);
+        }
+        else {
+            restoredSessionState = await storage.restoreState().catch(err => {
+                this._logService.error(`Error restoring chat editing session state for ${this.chatSessionResource}`, err);
+                return undefined;
+            });
+            if (this._store.isDisposed) {
+                return;
+            }
         }
         if (restoredSessionState) {
             for (const [uri, content] of restoredSessionState.initialFileContents) {
                 this._initialFileContents.set(uri, content);
             }
+            if (restoredSessionState.timeline) {
+                transaction(tx => this._timeline.restoreFromState(restoredSessionState.timeline, tx));
+            }
             await this._initEntries(restoredSessionState.recentSnapshot);
-            transaction(tx => {
-                if (restoredSessionState.timeline) {
-                    this._timeline.restoreFromState(restoredSessionState.timeline, tx);
-                }
-                this._state.set(ChatEditingSessionState.Idle, tx);
-            });
-        }
-        else {
-            this._state.set(ChatEditingSessionState.Idle, undefined);
         }
+        this._state.set(ChatEditingSessionState.Idle, undefined);
     }
     _getEntry(uri) {
         uri = CellUri.parse(uri)?.notebook ?? uri;
@@ -228,13 +236,13 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         return this._entriesObs.read(reader).find(e => isEqual(e.modifiedURI, uri));
     }
     storeState() {
-        const storage = this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionId);
+        const storage = this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionResource);
         return storage.storeState(this._getStoredState());
     }
-    _getStoredState(sessionId = this.chatSessionId) {
+    _getStoredState(sessionResource = this.chatSessionResource) {
         const entries = ( new ResourceMap());
         for (const entry of this._entriesObs.get()) {
-            entries.set(entry.modifiedURI, entry.createSnapshot(sessionId, undefined, undefined));
+            entries.set(entry.modifiedURI, entry.createSnapshot(sessionResource, undefined, undefined));
         }
         const state = {
             initialFileContents: this._initialFileContents,
@@ -249,6 +257,18 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
     getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId) {
         return this._timeline.getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId);
     }
+    getDiffsForFilesInSession() {
+        return this._timeline.getDiffsForFilesInSession();
+    }
+    getDiffForSession() {
+        return this._timeline.getDiffForSession();
+    }
+    getDiffsForFilesInRequest(requestId) {
+        return this._timeline.getDiffsForFilesInRequest(requestId);
+    }
+    hasEditsInRequest(requestId, reader) {
+        return this._timeline.hasEditsInRequest(requestId, reader);
+    }
     createSnapshot(requestId, undoStop) {
         const label = undoStop ? `Request ${requestId} - Stop ${undoStop}` : `Request ${requestId}`;
         this._timeline.createCheckpoint(requestId, undoStop, label);
@@ -325,7 +345,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(5204, "Suggested Edits"))
+            label: ( localize(5264, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorGroupsService.activeGroup.openEditor(input, { pinned: true, activation: EditorActivation.ACTIVATE });
     }
@@ -333,7 +353,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         this._stopPromise ??= Promise.allSettled([this._performStop(), this.storeState()]).then(() => { });
         await this._stopPromise;
         if (clearState) {
-            await this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionId).clearState();
+            await this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionResource).clearState();
         }
     }
     async _performStop() {
@@ -349,7 +369,6 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
     }
     dispose() {
         this._assertNotDisposed();
-        this._chatService.cancelCurrentRequestForSession(this.chatSessionResource);
         dispose(this._entriesObs.get());
         super.dispose();
         this._state.set(ChatEditingSessionState.Disposed, undefined);
@@ -366,6 +385,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         sequencer.queue(() => startPromise.p);
         this._baselineCreationLocks.queue(resource.path, () => startPromise.p);
         this._streamingEditLocks.queue(( resource.toString()), async () => {
+            await chatEditingSessionIsReady(this);
             if (!this.isDisposed) {
                 await this._acceptStreamingEditsStart(responseModel, inUndoStop, resource);
             }
@@ -410,16 +430,13 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
             },
         };
     }
-    async startExternalEdits(responseModel, operationId, resources) {
+    async startExternalEdits(responseModel, operationId, resources, undoStopId) {
         const snapshots = ( new ResourceMap());
         const acquiredLockPromises = [];
         const releaseLockPromises = [];
-        const undoStopId = generateUuid();
-        const progress = [{
-                kind: 'undoStop',
-                id: undoStopId,
-            }];
+        const progress = [];
         const telemetryInfo = this._getTelemetryInfoForModel(responseModel);
+        await chatEditingSessionIsReady(this);
         for (const resource of resources) {
             const releaseLock = ( new DeferredPromise());
             releaseLockPromises.push(releaseLock);
@@ -435,7 +452,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
                     await this._acceptStreamingEditsStart(responseModel, undoStopId, resource);
                 }
                 const notebookUri = CellUri.parse(resource)?.notebook || resource;
-                progress.push(...createOpeningEditCodeBlock(resource, this._notebookService.hasSupportedNotebooks(notebookUri)));
+                progress.push(...createOpeningEditCodeBlock(resource, this._notebookService.hasSupportedNotebooks(notebookUri), undoStopId));
                 await entry?.save();
                 snapshots.set(resource, entry && this._getCurrentTextOrNotebookSnapshot(entry));
                 entry?.startExternalEdit();
@@ -618,7 +635,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
             get modelId() { return responseModel.request?.modelId; }
             get modeId() { return responseModel.request?.modeInfo?.modeId; }
             get command() { return responseModel.slashCommand?.name; }
-            get sessionId() { return responseModel.session.sessionId; }
+            get sessionResource() { return responseModel.session.sessionResource; }
             get requestId() { return responseModel.requestId; }
             get result() { return responseModel.result; }
             get applyCodeBlockSuggestionId() { return responseModel.request?.modeInfo?.applyCodeBlockSuggestionId; }
@@ -750,11 +767,10 @@ ChatEditingSession = ChatEditingSession_1 = ( __decorate([
     ( __param(8, IBulkEditService)),
     ( __param(9, IEditorGroupsService)),
     ( __param(10, IEditorService)),
-    ( __param(11, IChatService)),
-    ( __param(12, INotebookService)),
-    ( __param(13, IAccessibilitySignalService)),
-    ( __param(14, ILogService)),
-    ( __param(15, IConfigurationService))
+    ( __param(11, INotebookService)),
+    ( __param(12, IAccessibilitySignalService)),
+    ( __param(13, ILogService)),
+    ( __param(14, IConfigurationService))
 ], ChatEditingSession));
 
 export { ChatEditingSession };

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

@@ -12,12 +12,13 @@ export interface StoredSessionState {
     readonly timeline: IChatEditingTimelineState | undefined;
 }
 export declare class ChatEditingSessionStorage {
-    private readonly chatSessionId;
+    private readonly _chatSessionResource;
     private readonly _fileService;
     private readonly _environmentService;
     private readonly _logService;
     private readonly _workspaceContextService;
-    constructor(chatSessionId: string, _fileService: IFileService, _environmentService: IEnvironmentService, _logService: ILogService, _workspaceContextService: IWorkspaceContextService);
+    private readonly storageKey;
+    constructor(_chatSessionResource: URI, _fileService: IFileService, _environmentService: IEnvironmentService, _logService: ILogService, _workspaceContextService: IWorkspaceContextService);
     protected _getStorageLocation(): URI;
     restoreState(): Promise<StoredSessionState | undefined>;
     storeState(state: StoredSessionState): Promise<void>;

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

@@ -10,20 +10,22 @@ import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { getKeyForChatSessionResource } from './chatEditingOperations.js';
 
 const STORAGE_CONTENTS_FOLDER = 'contents';
 const STORAGE_STATE_FILE = 'state.json';
 let ChatEditingSessionStorage = class ChatEditingSessionStorage {
-    constructor(chatSessionId, _fileService, _environmentService, _logService, _workspaceContextService) {
-        this.chatSessionId = chatSessionId;
+    constructor(_chatSessionResource, _fileService, _environmentService, _logService, _workspaceContextService) {
+        this._chatSessionResource = _chatSessionResource;
         this._fileService = _fileService;
         this._environmentService = _environmentService;
         this._logService = _logService;
         this._workspaceContextService = _workspaceContextService;
+        this.storageKey = getKeyForChatSessionResource(_chatSessionResource);
     }
     _getStorageLocation() {
         const workspaceId = this._workspaceContextService.getWorkspace().id;
-        return joinPath(this._environmentService.workspaceStorageHome, workspaceId, 'chatEditingSessions', this.chatSessionId);
+        return joinPath(this._environmentService.workspaceStorageHome, workspaceId, 'chatEditingSessions', this.storageKey);
     }
     async restoreState() {
         const storageLocation = this._getStorageLocation();
@@ -60,7 +62,7 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                     requestId: entry.telemetryInfo.requestId,
                     agentId: entry.telemetryInfo.agentId,
                     command: entry.telemetryInfo.command,
-                    sessionId: this.chatSessionId,
+                    sessionResource: this._chatSessionResource,
                     result: undefined,
                     modelId: entry.telemetryInfo.modelId,
                     modeId: entry.telemetryInfo.modeId,
@@ -158,7 +160,6 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
         try {
             const data = {
                 version: STORAGE_VERSION,
-                sessionId: this.chatSessionId,
                 initialFileContents: await serializeResourceMap(state.initialFileContents, value => addFileContent(value)),
                 timeline: state.timeline,
                 recentSnapshot: await serializeChatEditingSessionStop(state.recentSnapshot),

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

@@ -2,6 +2,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
+import { IDocumentDiff } from "../../../../../editor/common/diff/documentDiffProvider.js";
 import { DetailedLineRangeMapping } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping";
 import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ITextModel, ITextSnapshot } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
@@ -9,7 +10,7 @@ import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/edi
 import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { 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";
 type affectedLines = {
     linesAdded: number;
     linesRemoved: number;
@@ -83,6 +84,7 @@ export declare class ChatEditingTextModelChangeService extends Disposable {
     private _mirrorEdits;
     private _keepHunk;
     private _undoHunk;
+    getDiffInfo(): Promise<IDocumentDiff>;
     private _updateDiffInfoSeq;
     hasHunkAt(range: IRange): boolean;
     private _updateDiffInfo;

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

@@ -359,6 +359,13 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         this._accessibilitySignalService.playSignal(AccessibilitySignal.editsUndone, { allowManyInParallel: true });
         return true;
     }
+    async getDiffInfo() {
+        if (!this._diffOperation) {
+            this._updateDiffInfoSeq();
+        }
+        await this._diffOperation;
+        return this._diffInfo.get();
+    }
     async _updateDiffInfoSeq(notifyAction = undefined) {
         const myDiffOperationId = ++this._diffOperationIds;
         await Promise.resolve(this._diffOperation);

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

@@ -7,14 +7,14 @@ export declare class ChatEditingTextModelContentProvider implements ITextModelCo
     private readonly _chatEditingService;
     private readonly _modelService;
     static readonly scheme = "chat-editing-text-model";
-    static getFileURI(chatSessionId: string, documentId: string, path: string): URI;
+    static getFileURI(chatSessionResource: URI, documentId: string, path: string): URI;
     constructor(_chatEditingService: IChatEditingService, _modelService: IModelService);
     provideTextContent(resource: URI): Promise<ITextModel | null>;
 }
 export declare class ChatEditingSnapshotTextModelContentProvider implements ITextModelContentProvider {
     private readonly _chatEditingService;
     private readonly _modelService;
-    static getSnapshotFileURI(chatSessionId: string, requestId: string | undefined, undoStop: string | undefined, path: string, scheme?: string): URI;
+    static getSnapshotFileURI(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined, path: string, scheme?: string): URI;
     constructor(_chatEditingService: IChatEditingService, _modelService: IModelService);
     provideTextContent(resource: URI): Promise<ITextModel | null>;
 }

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

@@ -3,17 +3,16 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 
 var ChatEditingTextModelContentProvider_1;
 let ChatEditingTextModelContentProvider = class ChatEditingTextModelContentProvider {
     static { ChatEditingTextModelContentProvider_1 = this; }
     static { this.scheme = Schemas.chatEditingModel; }
-    static getFileURI(chatSessionId, documentId, path) {
+    static getFileURI(chatSessionResource, documentId, path) {
         return ( URI.from({
             scheme: ChatEditingTextModelContentProvider_1.scheme,
             path,
-            query: JSON.stringify({ kind: 'doc', documentId, chatSessionId }),
+            query: JSON.stringify({ kind: 'doc', documentId, chatSessionResource }),
         }));
     }
     constructor(_chatEditingService, _modelService) {
@@ -26,7 +25,7 @@ let ChatEditingTextModelContentProvider = class ChatEditingTextModelContentProvi
             return existing;
         }
         const data = JSON.parse(resource.query);
-        const session = this._chatEditingService.getEditingSession(LocalChatSessionUri.forSession(data.chatSessionId));
+        const session = this._chatEditingService.getEditingSession(URI.revive(data.chatSessionResource));
         const entry = session?.entries.get().find(candidate => candidate.entryId === data.documentId);
         if (!entry) {
             return null;
@@ -38,11 +37,11 @@ ChatEditingTextModelContentProvider = ChatEditingTextModelContentProvider_1 = (
     ( __param(1, IModelService))
 ], ChatEditingTextModelContentProvider));
 let ChatEditingSnapshotTextModelContentProvider = class ChatEditingSnapshotTextModelContentProvider {
-    static getSnapshotFileURI(chatSessionId, requestId, undoStop, path, scheme) {
+    static getSnapshotFileURI(chatSessionResource, requestId, undoStop, path, scheme) {
         return ( URI.from({
             scheme: Schemas.chatEditingSnapshotScheme,
             path,
-            query: JSON.stringify({ sessionId: chatSessionId, requestId: requestId ?? '', undoStop: undoStop ?? '', scheme }),
+            query: JSON.stringify({ session: chatSessionResource, requestId: requestId ?? '', undoStop: undoStop ?? '', scheme }),
         }));
     }
     constructor(_chatEditingService, _modelService) {
@@ -55,7 +54,7 @@ let ChatEditingSnapshotTextModelContentProvider = class ChatEditingSnapshotTextM
             return existing;
         }
         const data = JSON.parse(resource.query);
-        const session = this._chatEditingService.getEditingSession(LocalChatSessionUri.forSession(data.sessionId));
+        const session = this._chatEditingService.getEditingSession(URI.revive(data.session));
         if (!session || !data.requestId) {
             return null;
         }