@codingame/monaco-vscode-chat-service-override 29.1.1 → 30.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugToolCallContentRenderer.js

@@ -53,8 +53,8 @@ function renderSection(
     append(header, $("span.chat-debug-message-section-title", undefined, label));
     if (clipboardService) {
         const copyBtn = disposables.add(( new Button(header, {
-            title: ( localize(5909, "Copy")),
-            ariaLabel: ( localize(5909, "Copy")),
+            title: ( localize(5955, "Copy")),
+            ariaLabel: ( localize(5955, "Copy")),
             hoverDelegate: getDefaultHoverDelegate("mouse")
         })));
         copyBtn.icon = Codicon.copy;
@@ -97,10 +97,10 @@ async function renderToolCallContent(content, languageService, clipboardService,
     );
     const statusParts = [];
     if (content.result) {
-        statusParts.push(content.result === "success" ? ( localize(5910, "Success")) : ( localize(5911, "Error")));
+        statusParts.push(content.result === "success" ? ( localize(5956, "Success")) : ( localize(5957, "Error")));
     }
     if (content.durationInMillis !== undefined) {
-        statusParts.push(( localize(5912, "{0}ms", content.durationInMillis)));
+        statusParts.push(( localize(5958, "{0}ms", content.durationInMillis)));
     }
     if (statusParts.length > 0) {
         append(container, $(
@@ -115,14 +115,14 @@ async function renderToolCallContent(content, languageService, clipboardService,
             plainText,
             tokenizedHtml
         } = await tokenizeContent(content.input, languageService);
-        renderSection(sectionsContainer, ( localize(5913, "Arguments")), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
+        renderSection(sectionsContainer, ( localize(5959, "Arguments")), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
     }
     if (content.output) {
         const {
             plainText,
             tokenizedHtml
         } = await tokenizeContent(content.output, languageService);
-        renderSection(sectionsContainer, ( localize(5914, "Output")), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
+        renderSection(sectionsContainer, ( localize(5960, "Output")), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
     }
     return {
         element: container,
@@ -131,16 +131,16 @@ async function renderToolCallContent(content, languageService, clipboardService,
 }
 function toolCallContentToPlainText(content) {
     const lines = [];
-    lines.push(( localize(5915, "Tool: {0}", content.toolName)));
+    lines.push(( localize(5961, "Tool: {0}", content.toolName)));
     if (content.result) {
-        lines.push(( localize(5916, "Status: {0}", content.result)));
+        lines.push(( localize(5962, "Status: {0}", content.result)));
     }
     if (content.durationInMillis !== undefined) {
-        lines.push(( localize(5917, "Duration: {0}ms", content.durationInMillis)));
+        lines.push(( localize(5963, "Duration: {0}ms", content.durationInMillis)));
     }
     if (content.input) {
         lines.push("");
-        lines.push(`[${( localize(5913, "Arguments"))}]`);
+        lines.push(`[${( localize(5959, "Arguments"))}]`);
         try {
             const parsed = JSON.parse(content.input);
             lines.push(JSON.stringify(parsed, null, 2));
@@ -150,7 +150,7 @@ function toolCallContentToPlainText(content) {
     }
     if (content.output) {
         lines.push("");
-        lines.push(`[${( localize(5914, "Output"))}]`);
+        lines.push(`[${( localize(5960, "Output"))}]`);
         try {
             const parsed = JSON.parse(content.output);
             lines.push(JSON.stringify(parsed, null, 2));

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

@@ -620,7 +620,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 options: {
                     selection
                 },
-                label: ( localize(5953, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+                label: ( localize(6001, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
             });
             if (diffEditor && diffEditor.input) {
                 diffEditor.getControl()?.setSelection(selection);

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

@@ -66,6 +66,7 @@ export declare class ChatEditingDeletedFileEntry extends AbstractChatEditingModi
     createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
     restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
     resetToInitialContent(): Promise<void>;
+    resetEditTrackerToInitialContent(): Promise<void>;
     protected _areOriginalAndModifiedIdentical(): Promise<boolean>;
     protected _createUndoRedoElement(response: IChatResponseModel): IUndoRedoElement;
     acceptAgentEdits(_uri: URI, _edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, _responseModel: IChatResponseModel | undefined): Promise<void>;

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

@@ -134,6 +134,9 @@ let ChatEditingDeletedFileEntry = class ChatEditingDeletedFileEntry extends Abst
     async resetToInitialContent() {
         await this._fileService.writeFile(this.modifiedURI, VSBuffer.fromString(this._originalContent));
     }
+    resetEditTrackerToInitialContent() {
+        return Promise.resolve();
+    }
     async _areOriginalAndModifiedIdentical() {
         return this._originalContent === "";
     }

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

@@ -129,7 +129,7 @@ let ChatEditingExplanationModelManager = class ChatEditingExplanationModelManage
                     this._updateUriStatePartial(fileData.uri, {
                         progress: "error",
                         explanations: [],
-                        errorMessage: ( localize(5989, "No language model available"))
+                        errorMessage: ( localize(6037, "No language model available"))
                     });
                 }
                 return;
@@ -200,7 +200,7 @@ Example response format:
             for (const fileData of fileChanges) {
                 const explanations = [];
                 for (const data of fileData.changes) {
-                    const parsedExplanation = parsed[parsedIndex]?.explanation?.trim() || ( localize(5990, "Code was modified."));
+                    const parsedExplanation = parsed[parsedIndex]?.explanation?.trim() || ( localize(6038, "Code was modified."));
                     explanations.push({
                         uri: fileData.uri,
                         startLineNumber: data.startLineNumber,
@@ -218,7 +218,7 @@ Example response format:
             }
         } catch (e) {
             if (!cancellationToken.isCancellationRequested) {
-                const errorMessage = e instanceof Error ? e.message : ( localize(5991, "Failed to generate explanations"));
+                const errorMessage = e instanceof Error ? e.message : ( localize(6039, "Failed to generate explanations"));
                 for (const fileData of fileChanges) {
                     this._updateUriStatePartial(fileData.uri, {
                         progress: "error",

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

@@ -57,6 +57,7 @@ export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditin
     getCurrentContents(): string;
     restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
     resetToInitialContent(): Promise<void>;
+    resetEditTrackerToInitialContent(): Promise<void>;
     protected _areOriginalAndModifiedIdentical(): Promise<boolean>;
     protected _resetEditsState(tx: ITransaction): void;
     protected _createUndoRedoElement(response: IChatResponseModel): IUndoRedoElement;

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

@@ -142,7 +142,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             if (inProgress) {
                 const res = this._lastModifyingResponseObs.read(r);
                 const req = res && res.session.getRequests().find(value => value.id === res.requestId);
-                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(6004, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(6052, "Chat Edits")));
             } else {
                 resourceFilter.clear();
             }
@@ -175,6 +175,9 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     async resetToInitialContent() {
         await this._textModelChangeService.resetDocumentValues(undefined, this.initialContent);
     }
+    async resetEditTrackerToInitialContent() {
+        await this._textModelChangeService.resetDocumentValues(this.initialContent, undefined);
+    }
     async _areOriginalAndModifiedIdentical() {
         return this._textModelChangeService.areOriginalAndModifiedIdentical();
     }
@@ -184,7 +187,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(6005, "Chat Edit: '{0}'", request.message.text)) : ( localize(6006, "Chat Edit"));
+        const label = request?.message.text ? ( localize(6053, "Chat Edit: '{0}'", request.message.text)) : ( localize(6054, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, "chat.edit", this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {

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

@@ -106,6 +106,7 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     abstract equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
     abstract restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
     abstract resetToInitialContent(): Promise<void>;
+    abstract resetEditTrackerToInitialContent(): Promise<void>;
     abstract initialContent: string;
     /**
      * Computes the edits between two snapshots of the file content.

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

@@ -42,7 +42,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(6007, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(6055, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static {
         AbstractChatEditingModifiedFileEntry_1 = this;

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

@@ -13,7 +13,7 @@ import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
 import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
-import { CellDiffInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
+import { CellDiffInfo } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
 import { NotebookCellTextModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { ICellEditOperation, IResolvedNotebookEditorModel, NotebookTextModelChangedEvent, TransientOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
@@ -109,6 +109,7 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
     equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
     restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
+    resetEditTrackerToInitialContent(): Promise<void>;
     resetToInitialContent(): Promise<void>;
     restoreModifiedModelFromSnapshot(snapshot: string): Promise<void>;
     private restoreSnapshotInModifiedModel;

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

@@ -27,10 +27,10 @@ import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/com
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { SnapshotContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
-import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
+import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
 import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellEditType, NotebookCellsChangeType, NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { computeDiff } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
+import { computeDiff } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
 import { INotebookLoggingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
@@ -485,7 +485,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(6008, "Chat Edit: '{0}'", request.message.text)) : ( localize(6009, "Chat Edit"));
+        const label = request?.message.text ? ( localize(6056, "Chat Edit: '{0}'", request.message.text)) : ( localize(6057, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
@@ -928,6 +928,13 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         }
         this.initializeModelsFromDiff();
     }
+    async resetEditTrackerToInitialContent() {
+        if (this.initialContent) {
+            restoreSnapshot(this.originalModel, this.initialContent);
+        }
+        this.updateCellDiffInfo([], undefined);
+        this.initializeModelsFromDiff();
+    }
     async resetToInitialContent() {
         this.updateCellDiffInfo([], undefined);
         this.restoreSnapshotInModifiedModel(this.initialContent);

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

@@ -1,4 +1,4 @@
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 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 { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
@@ -16,7 +16,7 @@ import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
 import { IMultiDiffSourceResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
-import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatEditingSession, IChatEditingSessionProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
 import { ChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
@@ -29,6 +29,7 @@ export declare class ChatEditingService extends Disposable implements IChatEditi
     private readonly notebookService;
     private readonly _configurationService;
     _serviceBrand: undefined;
+    private readonly _providers;
     private readonly _sessionsObs;
     readonly editingSessionsObs: IObservable<readonly IChatEditingSession[]>;
     constructor(_instantiationService: IInstantiationService, multiDiffSourceResolverService: IMultiDiffSourceResolverService, textModelService: ITextModelService, contextKeyService: IContextKeyService, _chatService: IChatService, _editorService: IEditorService, decorationsService: IDecorationsService, _fileService: IFileService, lifecycleService: ILifecycleService, storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, productService: IProductService, notebookService: INotebookService, _configurationService: IConfigurationService);
@@ -39,6 +40,7 @@ export declare class ChatEditingService extends Disposable implements IChatEditi
     createEditingSession(chatModel: ChatModel, global?: boolean): IChatEditingSession;
     transferEditingSession(chatModel: ChatModel, session: IChatEditingSession): IChatEditingSession;
     private _createEditingSession;
+    registerEditingSessionProvider(scheme: string, provider: IChatEditingSessionProvider): IDisposable;
     private installAutoApplyObserver;
     private observerEditsInResponse;
 }

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

@@ -6,7 +6,7 @@ import { groupBy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/coll
 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';
-import { Disposable, dispose, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, dispose, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { LinkedList } from '@codingame/monaco-vscode-api/vscode/vs/base/common/linkedList';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
@@ -71,6 +71,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         this.lifecycleService = lifecycleService;
         this.notebookService = notebookService;
         this._configurationService = _configurationService;
+        this._providers = ( new Map());
         this._sessionsObs = observableValueOpts({
             equalsFn: (a, b) => false
         }, ( new LinkedList()));
@@ -94,7 +95,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         ));
         this._register(this._chatService.onDidDisposeSession(e => {
             if (e.reason === "cleared") {
-                for (const resource of e.sessionResource) {
+                for (const resource of e.sessionResources) {
                     this.getEditingSession(resource)?.stop();
                 }
             }
@@ -124,7 +125,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: "join.chatEditingSession",
-                label: ( localize(6010, "Saving chat edits history"))
+                label: ( localize(6058, "Saving chat edits history"))
             });
         }));
     }
@@ -158,7 +159,8 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             this.getEditingSession(chatModel.sessionResource) === undefined,
             "CANNOT have more than one editing session per chat session"
         );
-        const session = this._instantiationService.createInstance(
+        const provider = this._providers.get(chatModel.sessionResource.scheme);
+        const session = provider ? provider.createEditingSession(chatModel.sessionResource) : this._instantiationService.createInstance(
             ChatEditingSession,
             chatModel.sessionResource,
             global,
@@ -169,7 +171,9 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         const removeSession = list.unshift(session);
         const store = ( new DisposableStore());
         this._store.add(store);
-        store.add(this.installAutoApplyObserver(session, chatModel));
+        if (!provider && session instanceof ChatEditingSession) {
+            store.add(this.installAutoApplyObserver(session, chatModel));
+        }
         store.add(session.onDidDispose(e => {
             removeSession();
             this._sessionsObs.set(list, undefined);
@@ -178,6 +182,14 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         this._sessionsObs.set(list, undefined);
         return session;
     }
+    registerEditingSessionProvider(scheme, provider) {
+        this._providers.set(scheme, provider);
+        return toDisposable(() => {
+            if (this._providers.get(scheme) === provider) {
+                this._providers.delete(scheme);
+            }
+        });
+    }
     installAutoApplyObserver(session, chatModel) {
         if (!chatModel) {
             throw ( new ErrorNoTelemetry(
@@ -346,7 +358,7 @@ class ChatDecorationsProvider extends Disposable {
     constructor(_sessions) {
         super();
         this._sessions = _sessions;
-        this.label = ( localize(6011, "Chat Editing"));
+        this.label = ( localize(6059, "Chat Editing"));
         this._currentEntries = derived(this, r => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -390,7 +402,7 @@ class ChatDecorationsProvider extends Disposable {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: ( localize(6012, "Pending changes from chat")),
+                tooltip: ( localize(6060, "Pending changes from chat")),
                 bubble: true
             };
         }

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

@@ -39,6 +39,7 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private readonly _fileService;
     private readonly _explanationModelManager;
     private readonly _telemetryService;
+    readonly supportsKeepUndo = false;
     private readonly _state;
     private readonly _timeline;
     /**
@@ -94,8 +95,8 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     startStreamingEdits(resource: URI, responseModel: IChatResponseModel, inUndoStop: string | undefined): IStreamingEdits;
     startDeletion(resource: URI, responseModel: IChatResponseModel, undoStopId: string): void;
     applyWorkspaceEdit(edit: IChatWorkspaceEdit, responseModel: IChatResponseModel, undoStopId: string): void;
-    startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[], undoStopId: string): Promise<IChatProgress[]>;
-    stopExternalEdits(responseModel: IChatResponseModel, operationId: number): Promise<IChatProgress[]>;
+    startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[], undoStopId: string, contentFor?: URI[]): Promise<IChatProgress[]>;
+    stopExternalEdits(responseModel: IChatResponseModel, operationId: number, contentFor?: URI[]): Promise<IChatProgress[]>;
     undoInteraction(): Promise<void>;
     redoInteraction(): Promise<void>;
     triggerExplanationGeneration(): Promise<void>;

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

@@ -87,9 +87,6 @@ function createOpeningEditCodeBlock(uri, isNotebook, undoStopId) {
         uri,
         isEdit: true,
         undoStopId
-    }, {
-        kind: "markdownContent",
-        content: ( new MarkdownString("\n````\n"))
     }, isNotebook ? {
         kind: "notebookEdit",
         uri,
@@ -153,6 +150,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         this._fileService = _fileService;
         this._explanationModelManager = _explanationModelManager;
         this._telemetryService = _telemetryService;
+        this.supportsKeepUndo = false;
         this._state = observableValue(this, ChatEditingSessionState.Initial);
         this._initialFileContents = ( new ResourceMap());
         this._baselineCreationLocks = ( new SequencerByKey());
@@ -407,7 +405,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(6013, "Suggested Edits"))
+            label: ( localize(6061, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorService.openEditor(input, {
             pinned: true,
@@ -553,14 +551,16 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
             }
         }
     }
-    async startExternalEdits(responseModel, operationId, resources, undoStopId) {
+    async startExternalEdits(responseModel, operationId, resources, undoStopId, contentFor) {
         const snapshots = ( new ResourceMap());
         const acquiredLockPromises = [];
         const releaseLockPromises = [];
         const progress = [];
         const telemetryInfo = this._getTelemetryInfoForModel(responseModel);
         await chatEditingSessionIsReady(this);
-        for (const resource of resources) {
+        for (let i = 0; i < resources.length; i++) {
+            const resource = resources[i];
+            const contentSource = contentFor?.[i];
             const releaseLock = ( new DeferredPromise());
             releaseLockPromises.push(releaseLock);
             const acquiredLock = ( new DeferredPromise());
@@ -570,7 +570,16 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
                     acquiredLock.complete();
                     return;
                 }
-                const entry = await this._getOrCreateModifiedFileEntry(resource, NotExistBehavior.Abort, telemetryInfo);
+                let initialContent;
+                if (contentSource) {
+                    try {
+                        const data = await this._fileService.readFile(contentSource);
+                        initialContent = ( data.value.toString());
+                    } catch {
+                        initialContent = "";
+                    }
+                }
+                const entry = await this._getOrCreateModifiedFileEntry(resource, NotExistBehavior.Abort, telemetryInfo, initialContent);
                 if (entry) {
                     await this._acceptStreamingEditsStart(responseModel, undoStopId, resource);
                 }
@@ -580,8 +589,16 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
                     this._notebookService.hasSupportedNotebooks(notebookUri),
                     undoStopId
                 ));
-                await entry?.save();
-                snapshots.set(resource, entry && this._getCurrentTextOrNotebookSnapshot(entry));
+                if (initialContent !== undefined) {
+                    if (entry) {
+                        entry.initialContent = initialContent;
+                        await entry.resetEditTrackerToInitialContent();
+                    }
+                    snapshots.set(resource, initialContent);
+                } else {
+                    await entry?.save();
+                    snapshots.set(resource, entry && this._getCurrentTextOrNotebookSnapshot(entry));
+                }
                 entry?.startExternalEdit();
                 acquiredLock.complete();
                 return releaseLock.p;
@@ -597,7 +614,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         });
         return progress;
     }
-    async stopExternalEdits(responseModel, operationId) {
+    async stopExternalEdits(responseModel, operationId, contentFor) {
         const operation = this._externalEditOperations.get(operationId);
         if (!operation) {
             this._logService.warn(`stopExternalEdits called for unknown operation ${operationId}`);
@@ -606,6 +623,16 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         this._externalEditOperations.delete(operationId);
         const progress = [];
         try {
+            const contentForMap = ( new ResourceMap());
+            if (contentFor) {
+                let idx = 0;
+                for (const [resource] of operation.snapshots) {
+                    if (idx < contentFor.length && contentFor[idx]) {
+                        contentForMap.set(resource, contentFor[idx]);
+                    }
+                    idx++;
+                }
+            }
             for (const [resource, beforeSnapshot] of operation.snapshots) {
                 let entry = this._getEntry(resource);
                 if (!entry && beforeSnapshot === undefined) {
@@ -623,8 +650,19 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
                 if (!entry) {
                     continue;
                 }
-                await entry.revertToDisk();
-                const afterSnapshot = this._getCurrentTextOrNotebookSnapshot(entry);
+                let afterSnapshot;
+                const contentSource = contentForMap.get(resource);
+                if (contentSource) {
+                    try {
+                        const data = await this._fileService.readFile(contentSource);
+                        afterSnapshot = ( data.value.toString());
+                    } catch (_e) {
+                        afterSnapshot = "";
+                    }
+                } else {
+                    await entry.revertToDisk();
+                    afterSnapshot = this._getCurrentTextOrNotebookSnapshot(entry) ?? "";
+                }
                 let edits = [];
                 if (beforeSnapshot === undefined) {
                     this._timeline.recordFileOperation({
@@ -665,6 +703,10 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
                 this._state.set(ChatEditingSessionState.Idle, undefined);
             }
         }
+        progress.push({
+            kind: "markdownContent",
+            content: ( new MarkdownString("\n````\n"))
+        });
         return progress;
     }
     async undoInteraction() {

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

@@ -2,7 +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 { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { INotebookTextDiffEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser";
+import { INotebookTextDiffEditor } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser";
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
 import { IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 import { ChatEditingModifiedNotebookEntry } from "../chatEditingModifiedNotebookEntry.js";

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

@@ -16,8 +16,8 @@ import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/
 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 { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { NotebookDeletedCellDecorator } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator';
-import { NotebookInsertedCellDecorator } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator';
+import { NotebookDeletedCellDecorator } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator';
+import { NotebookInsertedCellDecorator } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator';
 import { NotebookModifiedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js';
 import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
@@ -630,7 +630,7 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             modified: {
                 resource: this._entry.modifiedURI
             },
-            label: ( localize(6014, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+            label: ( localize(6062, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }

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

@@ -136,7 +136,7 @@ function findImageInListByData(images, data) {
 }
 function buildCollectionArgs(sections, clickedGlobalIndex, sessionResource) {
     const collectionId = ( sessionResource.toString()) + "_carousel";
-    const defaultTitle = ( localize(6015, "Conversation Images"));
+    const defaultTitle = ( localize(6063, "Conversation Images"));
     return {
         collection: {
             id: collectionId,