@codingame/monaco-vscode-chat-service-override 13.1.7 → 14.0.0

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

@@ -1,49 +1,48 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Sequencer, timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { BugIndicatingError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { StringSHA1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
+import { Disposable, DisposableMap, dispose, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap, ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
-import { observableValue, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { observableValue, transaction, asyncTransaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { autorun, autorunDelta, autorunIterableDelta } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { isEqual, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { isDiffEditor, isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
+import { OffsetEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/offsetEdit';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { IFileDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
+import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.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';
+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 { DiffEditorInput } from '@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common/vscode/vs/workbench/common/editor/diffEditorInput';
+import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { DiffEditorInput } from '@codingame/monaco-vscode-4a28f637-7c3c-5e48-a77c-1b7538b38850-common/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-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-168b98e5-dc20-5807-b1f9-798f1f92b37f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { isNotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatEditingSessionState, ChatEditingSessionChangeType, WorkingSetEntryState, WorkingSetEntryRemovalReason, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { ChatEditingMultiDiffSourceResolver } from './chatEditingService.js';
-import { ChatEditingModifiedFileEntry } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry';
-import { ChatEditingTextModelContentProvider } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelContentProviders';
-import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { isEqual, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { StringSHA1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
-import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
-import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
-import { OffsetEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/offsetEdit';
-import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { ChatEditingSessionState, ChatEditingSessionChangeType, WorkingSetEntryState, WorkingSetEntryRemovalReason, 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 { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
+import { ChatEditingModifiedFileEntry } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry';
 import { ChatEditingModifiedNotebookEntry } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry';
-import { isNotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { ChatEditingTextModelContentProvider } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelContentProviders';
 
 const STORAGE_CONTENTS_FOLDER = 'contents';
 const STORAGE_STATE_FILE = 'state.json';
@@ -96,14 +95,15 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         this._assertNotDisposed();
         return this._onDidDispose.event;
     }
-    get isVisible() {
-        this._assertNotDisposed();
-        return Boolean(this._editorPane && this._editorPane.isVisible());
+    get isToolsAgentSession() {
+        return this._isToolsAgentSession;
     }
-    constructor(chatSessionId, editingSessionFileLimitPromise, _instantiationService, _modelService, _languageService, _textModelService, _bulkEditService, _editorGroupsService, _editorService, _workspaceContextService, _fileService, _dialogService, _chatAgentService, _chatService, _notebookService) {
+    constructor(chatSessionId, isGlobalEditingSession, editingSessionFileLimitPromise, _lookupExternalEntry, _instantiationService, _modelService, _languageService, _textModelService, _bulkEditService, _editorGroupsService, _editorService, _chatService, _notebookService, _textFileService, _chatAgentService) {
         super();
         this.chatSessionId = chatSessionId;
+        this.isGlobalEditingSession = isGlobalEditingSession;
         this.editingSessionFileLimitPromise = editingSessionFileLimitPromise;
+        this._lookupExternalEntry = _lookupExternalEntry;
         this._instantiationService = _instantiationService;
         this._modelService = _modelService;
         this._languageService = _languageService;
@@ -111,17 +111,14 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         this._bulkEditService = _bulkEditService;
         this._editorGroupsService = _editorGroupsService;
         this._editorService = _editorService;
-        this._workspaceContextService = _workspaceContextService;
-        this._fileService = _fileService;
-        this._dialogService = _dialogService;
-        this._chatAgentService = _chatAgentService;
         this._chatService = _chatService;
         this._notebookService = _notebookService;
+        this._textFileService = _textFileService;
+        this._chatAgentService = _chatAgentService;
         this._state = observableValue(this, ChatEditingSessionState.Initial);
         this._linearHistory = observableValue(this, []);
         this._linearHistoryIndex = observableValue(this, 0);
         this._initialFileContents = ( new ResourceMap());
-        this._filesToSkipCreating = ( new ResourceSet());
         this._entriesObs = observableValue(this, []);
         this._sequencer = ( new ThrottledSequencer(15, 1000));
         this._workingSet = ( new ResourceMap());
@@ -146,15 +143,13 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
             const linearHistoryIndex = this._linearHistoryIndex.read(r);
             return ( linearHistory.slice(linearHistoryIndex).map(s => s.requestId)).filter((r) => !!r);
         });
-        this._onDidChange = ( new Emitter());
+        this._onDidChange = this._register(( new Emitter()));
         this._onDidDispose = ( new Emitter());
+        this._isToolsAgentSession = false;
     }
     async init() {
         const restoredSessionState = await this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionId).restoreState();
         if (restoredSessionState) {
-            for (const uri of restoredSessionState.filesToSkipCreating) {
-                this._filesToSkipCreating.add(uri);
-            }
             for (const [uri, content] of restoredSessionState.initialFileContents) {
                 this._initialFileContents.set(uri, content);
             }
@@ -165,6 +160,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
             this._state.set(ChatEditingSessionState.Idle, undefined);
         }
         this._trackCurrentEditorsInWorkingSet();
+        this._triggerSaveParticipantsOnAccept();
         this._register(this._editorService.onDidVisibleEditorsChange(() => {
             this._trackCurrentEditorsInWorkingSet();
         }));
@@ -185,7 +181,6 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
     storeState() {
         const storage = this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionId);
         const state = {
-            filesToSkipCreating: [...this._filesToSkipCreating],
             initialFileContents: this._initialFileContents,
             pendingSnapshot: this._pendingSnapshot,
             recentSnapshot: this._createSnapshot(undefined),
@@ -194,6 +189,31 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         };
         return storage.storeState(state);
     }
+    _triggerSaveParticipantsOnAccept() {
+        const im = this._register(( new DisposableMap()));
+        const attachToEntry = (entry) => {
+            return autorunDelta(entry.state, ({ lastValue, newValue }) => {
+                if (newValue === WorkingSetEntryState.Accepted && lastValue === WorkingSetEntryState.Modified) {
+                    if (!this._textFileService.isDirty(entry.modifiedURI)) {
+                        this._textFileService.save(entry.modifiedURI, {
+                            reason: SaveReason.EXPLICIT,
+                            force: true,
+                            ignoreErrorHandler: true,
+                        }).catch(() => {
+                        });
+                    }
+                }
+            });
+        };
+        this._register(autorunIterableDelta(reader => this._entriesObs.read(reader), ({ addedValues, removedValues }) => {
+            for (const entry of addedValues) {
+                im.set(entry, attachToEntry(entry));
+            }
+            for (const entry of removedValues) {
+                im.deleteAndDispose(entry);
+            }
+        }));
+    }
     _trackCurrentEditorsInWorkingSet(e) {
         const existingTransientEntries = ( new ResourceSet());
         for (const file of ( this._workingSet.keys())) {
@@ -225,7 +245,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
             if (( existingTransientEntries.has(uri))) {
                 existingTransientEntries.delete(uri);
             }
-            else if (!( this._workingSet.has(uri)) && !( this._removedTransientEntries.has(uri))) {
+            else if ((!( this._workingSet.has(uri)) || this._workingSet.get(uri)?.state === WorkingSetEntryState.Suggested) && !( this._removedTransientEntries.has(uri))) {
                 activeEditors.add(uri);
             }
         });
@@ -234,7 +254,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
             didChange = this._workingSet.delete(entry) || didChange;
         }
         for (const entry of activeEditors) {
-            this._workingSet.set(entry, { state: WorkingSetEntryState.Transient, description: ( localize(4404, "Open Editor")) });
+            this._workingSet.set(entry, { state: WorkingSetEntryState.Transient, description: ( localize(4503, "Open Editor")) });
             didChange = true;
         }
         if (didChange) {
@@ -249,7 +269,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         if (requestId) {
             for (const [uri, data] of this._workingSet) {
                 if (data.state !== WorkingSetEntryState.Suggested) {
-                    this._workingSet.set(uri, { state: WorkingSetEntryState.Sent });
+                    this._workingSet.set(uri, { state: WorkingSetEntryState.Sent, isMarkedReadonly: data.isMarkedReadonly });
                 }
             }
             const linearHistory = this._linearHistory.get();
@@ -360,6 +380,22 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         }
         this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
     }
+    markIsReadonly(resource, isReadonly) {
+        const entry = this._workingSet.get(resource);
+        if (entry) {
+            if (entry.state === WorkingSetEntryState.Transient || entry.state === WorkingSetEntryState.Suggested) {
+                entry.state = WorkingSetEntryState.Attached;
+            }
+            entry.isMarkedReadonly = isReadonly ?? !entry.isMarkedReadonly;
+        }
+        else {
+            this._workingSet.set(resource, {
+                state: WorkingSetEntryState.Attached,
+                isMarkedReadonly: isReadonly ?? true
+            });
+        }
+        this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
+    }
     _assertNotDisposed() {
         if (this._state.get() === ChatEditingSessionState.Disposed) {
             throw ( new BugIndicatingError(`Cannot access a disposed editing session`));
@@ -403,8 +439,8 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
             }
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
-            multiDiffSource: ChatEditingMultiDiffSourceResolver.getMultiDiffSourceUri(),
-            label: ( localize(4405, "Suggested Edits"))
+            multiDiffSource: getMultiDiffSourceUri(),
+            label: ( localize(4504, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorGroupsService.activeGroup.openEditor(input, { pinned: true, activation: EditorActivation.ACTIVATE });
     }
@@ -433,12 +469,12 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
     }
     dispose() {
         this._assertNotDisposed();
-        for (const entry of this._entriesObs.get()) {
-            entry.dispose();
-        }
+        this._chatService.cancelCurrentRequestForSession(this.chatSessionId);
+        dispose(this._entriesObs.get());
         super.dispose();
         this._state.set(ChatEditingSessionState.Disposed, undefined);
         this._onDidDispose.fire();
+        this._onDidDispose.dispose();
     }
     getVirtualModel(documentId) {
         this._assertNotDisposed();
@@ -455,6 +491,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         if (this._state.get() === ChatEditingSessionState.Disposed) {
             return;
         }
+        this._isToolsAgentSession = !!responseModel.agent?.isToolsAgent;
         this._sequencer.queue(() => this._acceptTextEdits(resource, textEdits, isLastEdits, responseModel));
     }
     resolve() {
@@ -463,6 +500,38 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         }
         this._sequencer.queue(() => this._resolve());
     }
+    _trackUntitledWorkingSetEntry(resource) {
+        if (resource.scheme !== Schemas.untitled) {
+            return;
+        }
+        const untitled = this._textFileService.untitled.get(resource);
+        if (!untitled) {
+            return;
+        }
+        const store = ( new DisposableStore());
+        store.add(this.onDidChange(e => {
+            if (e === ChatEditingSessionChangeType.WorkingSet && !this._workingSet.get(resource)) {
+                store.dispose();
+            }
+        }));
+        store.add(this._textFileService.untitled.onDidSave(e => {
+            const existing = this._workingSet.get(resource);
+            if (isEqual(e.source, resource) && existing) {
+                this._workingSet.delete(resource);
+                this._workingSet.set(e.target, existing);
+                store.dispose();
+                this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
+            }
+        }));
+        store.add(this._editorService.onDidCloseEditor((e) => {
+            if (isEqual(e.editor.resource, resource)) {
+                this._workingSet.delete(resource);
+                store.dispose();
+                this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
+            }
+        }));
+        this._store.add(store);
+    }
     addFileToWorkingSet(resource, description, proposedState) {
         const state = this._workingSet.get(resource);
         if (proposedState === WorkingSetEntryState.Suggested) {
@@ -470,10 +539,12 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
                 return;
             }
             this._workingSet.set(resource, { description, state: WorkingSetEntryState.Suggested });
+            this._trackUntitledWorkingSetEntry(resource);
             this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
         }
         else if (state === undefined || state.state === WorkingSetEntryState.Transient || state.state === WorkingSetEntryState.Suggested) {
             this._workingSet.set(resource, { description, state: WorkingSetEntryState.Attached });
+            this._trackUntitledWorkingSetEntry(resource);
             this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
         }
     }
@@ -515,24 +586,9 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         });
     }
     async _acceptTextEdits(resource, textEdits, isLastEdits, responseModel) {
-        if (( this._filesToSkipCreating.has(resource))) {
-            return;
-        }
-        if (!this._entriesObs.get().find(e => isEqual(e.modifiedURI, resource)) && this._entriesObs.get().length >= (await this.editingSessionFileLimitPromise)) {
+        if (!this._chatAgentService.toolsAgentModeEnabled && !this._entriesObs.get().find(e => isEqual(e.modifiedURI, resource)) && this._entriesObs.get().length >= (await this.editingSessionFileLimitPromise)) {
             return;
         }
-        if (resource.scheme !== Schemas.untitled && !this._workspaceContextService.getWorkspaceFolder(resource) && !(await this._fileService.exists(resource))) {
-            const saveLocation = await this._dialogService.showSaveDialog({ title: ( localize(
-                4406,
-                '{0} wants to create a file. Choose where it should be saved.',
-                this._chatAgentService.getDefaultAgent(ChatAgentLocation.EditingSession)?.fullName ?? 'Chat'
-            )) });
-            if (!saveLocation) {
-                this._filesToSkipCreating.add(resource);
-                return;
-            }
-            resource = saveLocation;
-        }
         const telemetryInfo = new class {
             get agentId() { return responseModel.agent?.id; }
             get command() { return responseModel.slashCommand?.name; }
@@ -544,9 +600,18 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         entry.acceptAgentEdits(textEdits, isLastEdits);
     }
     async _resolve() {
-        transaction((tx) => {
+        await asyncTransaction(async (tx) => {
+            const entriesWithoutChange = ( new ResourceMap());
             for (const entry of this._entriesObs.get()) {
-                entry.acceptStreamingEditsEnd(tx);
+                await entry.acceptStreamingEditsEnd(tx);
+                if (entry.diffInfo.get().identical) {
+                    entriesWithoutChange.set(entry.modifiedURI, entry);
+                }
+            }
+            if (entriesWithoutChange.size > 0) {
+                const newEntries = this._entriesObs.get().filter(e => !( entriesWithoutChange.has(e.modifiedURI)));
+                this._entriesObs.set(newEntries, tx);
+                dispose(( entriesWithoutChange.values()));
             }
             this._state.set(ChatEditingSessionState.Idle, tx);
         });
@@ -560,19 +625,30 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
             }
             return existingEntry;
         }
-        const initialContent = this._initialFileContents.get(resource);
-        const entry = await this._createModifiedFileEntry(resource, responseModel, false, initialContent);
-        if (!initialContent) {
-            this._initialFileContents.set(resource, entry.initialContent);
+        let entry;
+        const existingExternalEntry = this._lookupExternalEntry(resource);
+        if (existingExternalEntry) {
+            entry = existingExternalEntry;
+        }
+        else {
+            const initialContent = this._initialFileContents.get(resource);
+            entry = await this._createModifiedFileEntry(resource, responseModel, false, initialContent);
+            if (!initialContent) {
+                this._initialFileContents.set(resource, entry.initialContent);
+            }
         }
-        this._register(entry.onDidDelete(() => {
+        const listener = entry.onDidDelete(() => {
             const newEntries = this._entriesObs.get().filter(e => !isEqual(e.modifiedURI, entry.modifiedURI));
             this._entriesObs.set(newEntries, undefined);
             this._workingSet.delete(entry.modifiedURI);
             this._editorService.closeEditors(this._editorService.findEditors(entry.modifiedURI));
-            entry.dispose();
+            if (!existingExternalEntry) {
+                entry.dispose();
+            }
+            this._store.delete(listener);
             this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
-        }));
+        });
+        this._store.add(listener);
         const entriesArr = [...this._entriesObs.get(), entry];
         this._entriesObs.set(entriesArr, undefined);
         this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
@@ -605,19 +681,17 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
     }
 };
 ChatEditingSession = ( __decorate([
-    ( __param(2, IInstantiationService)),
-    ( __param(3, IModelService)),
-    ( __param(4, ILanguageService)),
-    ( __param(5, ITextModelService)),
-    ( __param(6, IBulkEditService)),
-    ( __param(7, IEditorGroupsService)),
-    ( __param(8, IEditorService)),
-    ( __param(9, IWorkspaceContextService)),
-    ( __param(10, IFileService)),
-    ( __param(11, IFileDialogService)),
-    ( __param(12, IChatAgentService)),
-    ( __param(13, IChatService)),
-    ( __param(14, INotebookService))
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IModelService)),
+    ( __param(6, ILanguageService)),
+    ( __param(7, ITextModelService)),
+    ( __param(8, IBulkEditService)),
+    ( __param(9, IEditorGroupsService)),
+    ( __param(10, IEditorService)),
+    ( __param(11, IChatService)),
+    ( __param(12, INotebookService)),
+    ( __param(13, ITextFileService)),
+    ( __param(14, IChatAgentService))
 ], ChatEditingSession));
 let ChatEditingSessionStorage = class ChatEditingSessionStorage {
     constructor(chatSessionId, _fileService, _environmentService, _logService, _workspaceContextService) {
@@ -679,7 +753,6 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                 return undefined;
             }
             const linearHistory = await Promise.all(( data.linearHistory.map(deserializeChatEditingSessionSnapshot)));
-            const filesToSkipCreating = ( data.filesToSkipCreating.map((uriStr) => ( URI.parse(uriStr))));
             const initialFileContents = ( new ResourceMap());
             for (const fileContentDTO of data.initialFileContents) {
                 initialFileContents.set(( URI.parse(fileContentDTO[0])), await getFileContent(fileContentDTO[1]));
@@ -687,7 +760,6 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
             const pendingSnapshot = data.pendingSnapshot ? await deserializeChatEditingSessionSnapshot(data.pendingSnapshot) : undefined;
             const recentSnapshot = await deserializeChatEditingSessionSnapshot(data.recentSnapshot);
             return {
-                filesToSkipCreating,
                 initialFileContents,
                 pendingSnapshot,
                 recentSnapshot,
@@ -764,7 +836,6 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                 initialFileContents: serializeResourceMap(state.initialFileContents, value => addFileContent(value)),
                 pendingSnapshot: state.pendingSnapshot ? serializeChatEditingSessionSnapshot(state.pendingSnapshot) : undefined,
                 recentSnapshot: serializeChatEditingSessionSnapshot(state.recentSnapshot),
-                filesToSkipCreating: ( state.filesToSkipCreating.map(uri => ( uri.toString()))),
             };
             this._logService.debug(`chatEditingSession: Storing editing session at ${( storageFolder.toString())}: ${fileContents.size} files`);
             for (const [hash, content] of fileContents) {

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

@@ -7,10 +7,10 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { EditorPane } from "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/parts/editor/editorPane";
 import { IEditorOpenContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { ChatEditorInput } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
-import { IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
+import { IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IEditorGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
 export interface IChatEditorOptions extends IEditorOptions {
     target?: {

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

@@ -18,13 +18,13 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { EditorPane } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/editor/editorPane';
-import { Memento } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/common/memento';
-import { clearChatEditor } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
-import { ChatEditorInput } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { EditorPane } from '@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/parts/editor/editorPane';
+import { Memento } from '@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common/vscode/vs/workbench/common/memento';
+import { clearChatEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
 
 let ChatEditor = class ChatEditor extends EditorPane {

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

@@ -9,13 +9,9 @@ export declare class ChatExtensionPointHandler implements IWorkbenchContribution
     private readonly _chatAgentService;
     private readonly logService;
     static readonly ID = "workbench.contrib.chatExtensionPointHandler";
-    private _viewContainer;
     private _participantRegistrationDisposables;
     constructor(_chatAgentService: IChatAgentService, logService: ILogService);
     private handleAndRegisterChatExtensions;
-    private registerViewContainer;
-    private registerDefaultParticipantView;
-    private registerChatEditingView;
 }
 export declare class ChatCompatibilityNotifier extends Disposable implements IWorkbenchContribution {
     private readonly productService;