@codingame/monaco-vscode-chat-service-override 22.1.9 → 23.0.0

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

@@ -0,0 +1,117 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+import { IModifiedEntryTelemetryInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+export declare enum FileOperationType {
+    Create = "create",
+    Delete = "delete",
+    Rename = "rename",
+    TextEdit = "textEdit",
+    NotebookEdit = "notebookEdit"
+}
+/**
+ * Base interface for all file operations in the checkpoint timeline
+ */
+export interface IFileOperation {
+    readonly type: FileOperationType;
+    readonly uri: URI;
+    readonly requestId: string;
+    readonly epoch: number;
+}
+/**
+ * Operation representing the creation of a new file
+ */
+export interface IFileCreateOperation extends IFileOperation {
+    readonly type: FileOperationType.Create;
+    readonly initialContent: string;
+    readonly notebookViewType?: string;
+    readonly telemetryInfo: IModifiedEntryTelemetryInfo;
+}
+/**
+ * Operation representing the deletion of a file
+ */
+export interface IFileDeleteOperation extends IFileOperation {
+    readonly type: FileOperationType.Delete;
+    readonly finalContent: string;
+}
+/**
+ * Operation representing the renaming/moving of a file
+ */
+export interface IFileRenameOperation extends IFileOperation {
+    readonly type: FileOperationType.Rename;
+    readonly oldUri: URI;
+    readonly newUri: URI;
+}
+/**
+ * Operation representing text edits applied to a file
+ */
+export interface ITextEditOperation extends IFileOperation {
+    readonly type: FileOperationType.TextEdit;
+    readonly edits: readonly TextEdit[];
+    /**
+     * For cell URIs, the cell index that was edited. Needed because the original
+     * edit URI only contains the `handle` which is not portable between notebooks.
+     */
+    readonly cellIndex?: number;
+}
+/**
+ * Operation representing notebook cell edits applied to a notebook
+ */
+export interface INotebookEditOperation extends IFileOperation {
+    readonly type: FileOperationType.NotebookEdit;
+    readonly cellEdits: readonly ICellEditOperation[];
+}
+/**
+ * Union type of all possible file operations
+ */
+export type FileOperation = IFileCreateOperation | IFileDeleteOperation | IFileRenameOperation | ITextEditOperation | INotebookEditOperation;
+/**
+ * File baseline represents the initial state of a file when first edited in a request
+ */
+export interface IFileBaseline {
+    readonly uri: URI;
+    readonly requestId: string;
+    readonly content: string;
+    readonly epoch: number;
+    readonly telemetryInfo: IModifiedEntryTelemetryInfo;
+    readonly notebookViewType?: string;
+}
+export interface IReconstructedFileExistsState {
+    readonly exists: true;
+    readonly content: string;
+    readonly uri: URI;
+    readonly telemetryInfo: IModifiedEntryTelemetryInfo;
+    readonly notebookViewType?: string;
+}
+export interface IReconstructedFileNotExistsState {
+    readonly exists: false;
+    readonly uri: URI;
+}
+/**
+ * The reconstructed state of a file at a specific checkpoint
+ */
+export type IReconstructedFileState = IReconstructedFileNotExistsState | IReconstructedFileExistsState;
+/**
+ * Checkpoint represents a stable state that can be navigated to
+ */
+export interface ICheckpoint {
+    readonly checkpointId: string;
+    readonly requestId: string | undefined;
+    readonly undoStopId: string | undefined;
+    readonly epoch: number;
+    readonly label: string;
+    readonly description?: string;
+}
+/**
+ * State that can be persisted and restored for the checkpoint timeline
+ */
+export interface IChatEditingTimelineState {
+    readonly checkpoints: readonly ICheckpoint[];
+    readonly fileBaselines: [
+        string,
+        IFileBaseline
+    ][];
+    readonly operations: readonly FileOperation[];
+    readonly currentEpoch: number;
+    readonly epochCounter: number;
+}

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

@@ -0,0 +1,12 @@
+
+
+var FileOperationType;
+(function (FileOperationType) {
+    FileOperationType["Create"] = "create";
+    FileOperationType["Delete"] = "delete";
+    FileOperationType["Rename"] = "rename";
+    FileOperationType["TextEdit"] = "textEdit";
+    FileOperationType["NotebookEdit"] = "notebookEdit";
+})(FileOperationType || (FileOperationType = {}));
+
+export { FileOperationType };

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-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/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-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/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;
@@ -38,13 +38,15 @@ export declare class ChatEditingService extends Disposable implements IChatEditi
     dispose(): void;
     startOrContinueGlobalEditingSession(chatModel: ChatModel, waitForRestore?: boolean): Promise<IChatEditingSession>;
     private _lookupEntry;
-    getEditingSession(chatSessionId: string): IChatEditingSession | undefined;
+    getEditingSession(chatSessionResource: URI): IChatEditingSession | undefined;
     createEditingSession(chatModel: ChatModel, global?: boolean): Promise<IChatEditingSession>;
+    transferEditingSession(chatModel: ChatModel, session: IChatEditingSession): Promise<IChatEditingSession>;
+    private _createEditingSession;
     private installAutoApplyObserver;
     private observerEditsInResponse;
     hasRelatedFilesProviders(): boolean;
     registerRelatedFilesProvider(handle: number, provider: IChatRelatedFilesProvider): IDisposable;
-    getRelatedFiles(chatSessionId: string, prompt: string, files: URI[], token: CancellationToken): Promise<{
+    getRelatedFiles(chatSessionResource: URI, prompt: string, files: URI[], token: CancellationToken): Promise<{
         group: string;
         files: IChatRelatedFile[];
     }[] | undefined>;

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

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { coalesce, delta, compareBy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { groupBy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/collections';
 import { ErrorNoTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
@@ -28,16 +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-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
+import { MultiDiffEditorItem } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/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 { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.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 { isCellTextEditOperation } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatEditorInput } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingSession } from './chatEditingSession.js';
 import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
@@ -68,7 +67,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         this._register(textModelService.registerTextModelContentProvider(Schemas.chatEditingSnapshotScheme, _instantiationService.createInstance(ChatEditingSnapshotTextModelContentProvider, this)));
         this._register(this._chatService.onDidDisposeSession((e) => {
             if (e.reason === 'cleared') {
-                this.getEditingSession(e.sessionId)?.stop();
+                this.getEditingSession(e.sessionResource)?.stop();
             }
         }));
         const readonlyEnabledContextKey = chatEditingAgentSupportsReadonlyReferencesContextKey.bindTo(contextKeyService);
@@ -98,7 +97,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: 'join.chatEditingSession',
-                label: ( localize(5104, "Saving chat edits history"))
+                label: ( localize(5181, "Saving chat edits history"))
             });
         }));
     }
@@ -110,7 +109,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         if (waitForRestore) {
             await this._restoringEditingSession;
         }
-        const session = this.getEditingSession(chatModel.sessionId);
+        const session = this.getEditingSession(chatModel.sessionResource);
         if (session) {
             return session;
         }
@@ -126,14 +125,20 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         }
         return undefined;
     }
-    getEditingSession(chatSessionId) {
+    getEditingSession(chatSessionResource) {
         return this.editingSessionsObs.get()
-            .find(candidate => candidate.chatSessionId === chatSessionId);
+            .find(candidate => isEqual(candidate.chatSessionResource, chatSessionResource));
     }
     async createEditingSession(chatModel, global = false) {
-        assertType(this.getEditingSession(chatModel.sessionId) === undefined, 'CANNOT have more than one editing session per chat session');
-        const session = this._instantiationService.createInstance(ChatEditingSession, chatModel.sessionId, global, this._lookupEntry.bind(this));
-        await session.init();
+        return this._createEditingSession(chatModel, global, undefined);
+    }
+    async transferEditingSession(chatModel, session) {
+        return this._createEditingSession(chatModel, session.isGlobalEditingSession, session);
+    }
+    async _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 list = this._sessionsObs.get();
         const removeSession = list.unshift(session);
         const store = ( new DisposableStore());
@@ -173,32 +178,29 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         const editorListener = Event.once(this._editorService.onDidActiveEditorChange)(() => {
             editorDidChange = true;
         });
-        const editedFilesExist = ( new ResourceMap());
+        const editorOpenPromises = ( new ResourceMap());
+        const openChatEditedFiles = this._configurationService.getValue('accessibility.openChatEditedFiles');
         const ensureEditorOpen = (partUri) => {
             const uri = CellUri.parse(partUri)?.notebook ?? partUri;
-            if (( editedFilesExist.has(uri))) {
+            if (( editorOpenPromises.has(uri))) {
                 return;
             }
-            const fileExists = this.notebookService.getNotebookTextModel(uri) ? Promise.resolve(true) : this._fileService.exists(uri);
-            editedFilesExist.set(uri, fileExists.then((e) => {
-                if (!e) {
-                    return;
-                }
-                const activeUri = this._editorService.activeEditorPane?.input.resource;
-                const inactive = editorDidChange
-                    || this._editorService.activeEditorPane?.input instanceof ChatEditorInput && this._editorService.activeEditorPane.input.sessionId === session.chatSessionId
-                    || Boolean(activeUri && session.entries.get().find(entry => isEqual(activeUri, entry.modifiedURI)));
-                if (this._configurationService.getValue('accessibility.openChatEditedFiles')) {
+            editorOpenPromises.set(uri, (async () => {
+                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
+                        || Boolean(activeUri && session.entries.get().find(entry => isEqual(activeUri, entry.modifiedURI)));
                     this._editorService.openEditor({ resource: uri, options: { inactive, preserveFocus: true, pinned: true } });
                 }
-            }));
+            })());
         };
         const onResponseComplete = () => {
             for (const remaining of editsSeen) {
                 remaining?.streaming.complete();
             }
             editsSeen.length = 0;
-            editedFilesExist.clear();
+            editorOpenPromises.clear();
             editorListener.dispose();
         };
         const handleResponseParts = async () => {
@@ -215,32 +217,37 @@ let ChatEditingService = class ChatEditingService extends Disposable {
                 if (part.kind !== 'textEditGroup' && part.kind !== 'notebookEditGroup') {
                     continue;
                 }
-                ensureEditorOpen(part.uri);
+                if (part.isExternalEdit) {
+                    continue;
+                }
+                if (openChatEditedFiles) {
+                    ensureEditorOpen(part.uri);
+                }
                 let entry = editsSeen[i];
                 if (!entry) {
                     entry = { seen: 0, streaming: session.startStreamingEdits(CellUri.parse(part.uri)?.notebook ?? part.uri, responseModel, undoStop) };
                     editsSeen[i] = entry;
                 }
                 const isFirst = entry.seen === 0;
-                const newEdits = part.edits.slice(entry.seen).flat();
+                const newEdits = part.edits.slice(entry.seen);
                 entry.seen = part.edits.length;
                 if (newEdits.length > 0 || isFirst) {
-                    if (part.kind === 'notebookEditGroup') {
-                        newEdits.forEach((edit, idx) => {
-                            const done = part.done ? idx === newEdits.length - 1 : false;
-                            if (TextEdit.isTextEdit(edit)) {
-                                return;
-                            }
-                            else if (isCellTextEditOperation(edit)) {
-                                entry.streaming.pushNotebookCellText(edit.uri, [edit.edit], done);
-                            }
-                            else {
-                                entry.streaming.pushNotebook([edit], done);
+                    for (let i = 0; i < newEdits.length; i++) {
+                        const edit = newEdits[i];
+                        const done = part.done ? i === newEdits.length - 1 : false;
+                        if (isTextEditOperationArray(edit)) {
+                            entry.streaming.pushText(edit, done);
+                        }
+                        else if (isCellTextEditOperationArray(edit)) {
+                            for (const edits of ( Object.values(groupBy(edit, e => ( e.uri.toString()))))) {
+                                if (edits) {
+                                    entry.streaming.pushNotebookCellText(edits[0].uri, ( edits.map(e => e.edit)), done);
+                                }
                             }
-                        });
-                    }
-                    else if (part.kind === 'textEditGroup') {
-                        entry.streaming.pushText(newEdits, part.done ?? false);
+                        }
+                        else {
+                            entry.streaming.pushNotebook(edit, done);
+                        }
                     }
                 }
                 if (part.done) {
@@ -278,7 +285,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             this._chatRelatedFilesProviders.delete(handle);
         });
     }
-    async getRelatedFiles(chatSessionId, prompt, files, token) {
+    async getRelatedFiles(chatSessionResource, prompt, files, token) {
         const providers = Array.from(( this._chatRelatedFilesProviders.values()));
         const result = await Promise.all(( providers.map(async (provider) => {
             try {
@@ -321,12 +328,11 @@ function observeArrayChanges(obs, compare, store) {
     }));
     return emitter.event;
 }
-let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
-    constructor(_sessions, _chatAgentService) {
+class ChatDecorationsProvider extends Disposable {
+    constructor(_sessions) {
         super();
         this._sessions = _sessions;
-        this._chatAgentService = _chatAgentService;
-        this.label = ( localize(5105, "Chat Editing"));
+        this.label = ( localize(5182, "Chat Editing"));
         this._currentEntries = derived(this, (r) => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -362,20 +368,16 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
         }
         const isModified = ( this._modifiedUris.get().some(e => ( e.toString()) === ( uri.toString())));
         if (isModified) {
-            const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Chat)?.fullName;
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: defaultAgentName ? ( localize(5106, "Pending changes from {0}", defaultAgentName)) : ( localize(5107, "Pending changes from chat")),
+                tooltip: ( localize(5183, "Pending changes from chat")),
                 bubble: true
             };
         }
         return undefined;
     }
-};
-ChatDecorationsProvider = ( __decorate([
-    ( __param(1, IChatAgentService))
-], ChatDecorationsProvider));
+}
 let ChatEditingMultiDiffSourceResolver = class ChatEditingMultiDiffSourceResolver {
     constructor(_editingSessionsObs, _instantiationService) {
         this._editingSessionsObs = _editingSessionsObs;
@@ -426,5 +428,8 @@ class ChatEditingMultiDiffSource {
         };
     }
 }
+function isTextEditOperationArray(value) {
+    return ( value.some(e => TextEdit.isTextEdit(e)));
+}
 
 export { ChatEditingMultiDiffSourceResolver, ChatEditingService };

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

@@ -1,3 +1,4 @@
+import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable, IReader } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
@@ -7,16 +8,20 @@ import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.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 { 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, ISnapshotEntry, IStreamingEdits } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+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 { 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;
     private readonly _instantiationService;
@@ -29,12 +34,21 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private readonly _chatService;
     private readonly _notebookService;
     private readonly _accessibilitySignalService;
+    private readonly _logService;
+    private readonly configurationService;
     private readonly _state;
     private readonly _timeline;
     /**
      * Contains the contents of a file when the AI first began doing edits to it.
      */
     private readonly _initialFileContents;
+    private readonly _baselineCreationLocks;
+    private readonly _streamingEditLocks;
+    /**
+     * Tracks active external edit operations.
+     * Key is operationId, value contains the operation state.
+     */
+    private readonly _externalEditOperations;
     private readonly _entriesObs;
     get entries(): IObservable<readonly IModifiedFileEntry[]>;
     private _editorPane;
@@ -43,26 +57,21 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     readonly canRedo: IObservable<boolean>;
     private readonly _onDidDispose;
     get onDidDispose(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
-    constructor(chatSessionId: string, 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);
-    init(): Promise<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);
+    private _getTimelineDelegate;
+    init(transferFrom?: IChatEditingSession): Promise<void>;
     private _getEntry;
     getEntry(uri: URI): IModifiedFileEntry | undefined;
     readEntry(uri: URI, reader: IReader | undefined): IModifiedFileEntry | undefined;
     storeState(): Promise<void>;
-    private _ensurePendingSnapshot;
-    getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService").IEditSessionEntryDiff | undefined>;
+    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>;
-    createSnapshot(requestId: string, undoStop: string | undefined, makeEmpty?: boolean): void;
-    private _createSnapshot;
-    getSnapshot(requestId: string, undoStop: string | undefined, snapshotUri: URI): ISnapshotEntry | undefined;
+    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>;
     getSnapshotUri(requestId: string, uri: URI, stopId: string | undefined): URI | undefined;
-    /**
-     * A snapshot representing the state of the working set before a new request has been sent
-     */
-    private _pendingSnapshot;
-    restoreSnapshot(requestId: string | undefined, stopId: string | undefined): Promise<void>;
-    private _restoreSnapshot;
+    restoreSnapshot(requestId: string, stopId: string | undefined): Promise<void>;
     private _assertNotDisposed;
     accept(...uris: URI[]): Promise<void>;
     reject(...uris: URI[]): Promise<void>;
@@ -72,12 +81,16 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     stop(clearState?: boolean): Promise<void>;
     private _performStop;
     dispose(): void;
-    private _streamingEditLocks;
     private get isDisposed();
     startStreamingEdits(resource: URI, responseModel: IChatResponseModel, inUndoStop: string | undefined): IStreamingEdits;
+    startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[]): Promise<IChatProgress[]>;
+    stopExternalEdits(responseModel: IChatResponseModel, operationId: number): Promise<IChatProgress[]>;
     undoInteraction(): Promise<void>;
     redoInteraction(): Promise<void>;
+    private _recordEditOperations;
+    private _getCurrentTextOrNotebookSnapshot;
     private _acceptStreamingEditsStart;
+    private _initEntries;
     private _acceptEdits;
     private _getTelemetryInfoForModel;
     private _resolve;