@codingame/monaco-vscode-chat-service-override 20.5.0 → 21.0.1

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

@@ -8,6 +8,7 @@ import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/ite
 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';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { compare } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
@@ -32,7 +33,7 @@ import { IMultiDiffSourceResolverService } from '@codingame/monaco-vscode-api/vs
 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 { chatEditingSnapshotScheme, 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 { 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 { 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';
@@ -64,7 +65,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         this._register(decorationsService.registerDecorationsProvider(_instantiationService.createInstance(ChatDecorationsProvider, this.editingSessionsObs)));
         this._register(multiDiffSourceResolverService.registerResolver(_instantiationService.createInstance(ChatEditingMultiDiffSourceResolver, this.editingSessionsObs)));
         this._register(textModelService.registerTextModelContentProvider(ChatEditingTextModelContentProvider.scheme, _instantiationService.createInstance(ChatEditingTextModelContentProvider, this)));
-        this._register(textModelService.registerTextModelContentProvider(chatEditingSnapshotScheme, _instantiationService.createInstance(ChatEditingSnapshotTextModelContentProvider, this)));
+        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();
@@ -97,7 +98,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: 'join.chatEditingSession',
-                label: ( localize(4961, "Saving chat edits history"))
+                label: ( localize(5053, "Saving chat edits history"))
             });
         }));
     }
@@ -196,9 +197,6 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             for (const remaining of editsSeen) {
                 remaining?.streaming.complete();
             }
-            if (responseModel.result?.errorDetails && !responseModel.result.errorDetails.responseIsIncomplete) {
-                session.restoreSnapshot(responseModel.requestId, undefined);
-            }
             editsSeen.length = 0;
             editedFilesExist.clear();
             editorListener.dispose();
@@ -328,7 +326,7 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
         super();
         this._sessions = _sessions;
         this._chatAgentService = _chatAgentService;
-        this.label = ( localize(4962, "Chat Editing"));
+        this.label = ( localize(5054, "Chat Editing"));
         this._currentEntries = derived(this, (r) => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -368,7 +366,7 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: defaultAgentName ? ( localize(4963, "Pending changes from {0}", defaultAgentName)) : ( localize(4964, "Pending changes from chat")),
+                tooltip: defaultAgentName ? ( localize(5055, "Pending changes from {0}", defaultAgentName)) : ( localize(5056, "Pending changes from chat")),
                 bubble: true
             };
         }

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

@@ -51,6 +51,7 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     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>;
+    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;

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

@@ -26,6 +26,7 @@ import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contri
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { ChatEditingSessionState, ModifiedFileEntryState, getMultiDiffSourceUri, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatEditingModifiedDocumentEntry } from './chatEditingModifiedDocumentEntry.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
@@ -36,6 +37,11 @@ import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
+var NotExistBehavior;
+(function (NotExistBehavior) {
+    NotExistBehavior[NotExistBehavior["Create"] = 0] = "Create";
+    NotExistBehavior[NotExistBehavior["Abort"] = 1] = "Abort";
+})(NotExistBehavior || (NotExistBehavior = {}));
 class ThrottledSequencer extends Sequencer {
     constructor(_minDuration, _maxOverallDelay) {
         super();
@@ -180,6 +186,9 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
     getEntryDiffBetweenStops(uri, requestId, stopId) {
         return this._timeline.getEntryDiffBetweenStops(uri, requestId, stopId);
     }
+    getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId) {
+        return this._timeline.getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId);
+    }
     createSnapshot(requestId, undoStop, makeEmpty = undoStop !== undefined) {
         this._timeline.pushSnapshot(requestId, undoStop, makeEmpty ? ChatEditingTimeline.createEmptySnapshot(undoStop) : this._createSnapshot(requestId, undoStop));
     }
@@ -235,10 +244,12 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         }
         const entriesArr = [];
         for (const snapshotEntry of ( entries.values())) {
-            const entry = await this._getOrCreateModifiedFileEntry(snapshotEntry.resource, snapshotEntry.telemetryInfo);
-            const restoreToDisk = snapshotEntry.state === ModifiedFileEntryState.Modified || restoreResolvedToDisk;
-            await entry.restoreFromSnapshot(snapshotEntry, restoreToDisk);
-            entriesArr.push(entry);
+            const entry = await this._getOrCreateModifiedFileEntry(snapshotEntry.resource, restoreResolvedToDisk ? NotExistBehavior.Create : NotExistBehavior.Abort, snapshotEntry.telemetryInfo);
+            if (entry) {
+                const restoreToDisk = snapshotEntry.state === ModifiedFileEntryState.Modified || restoreResolvedToDisk;
+                await entry.restoreFromSnapshot(snapshotEntry, restoreToDisk);
+                entriesArr.push(entry);
+            }
         }
         this._entriesObs.set(entriesArr, undefined);
     }
@@ -286,7 +297,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(4965, "Suggested Edits"))
+            label: ( localize(5057, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorGroupsService.activeGroup.openEditor(input, { pinned: true, activation: EditorActivation.ACTIVATE });
     }
@@ -394,7 +405,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         }
     }
     async _acceptStreamingEditsStart(responseModel, undoStop, resource) {
-        const entry = await this._getOrCreateModifiedFileEntry(resource, this._getTelemetryInfoForModel(responseModel));
+        const entry = await this._getOrCreateModifiedFileEntry(resource, NotExistBehavior.Create, this._getTelemetryInfoForModel(responseModel));
         transaction((tx) => {
             this._state.set(ChatEditingSessionState.StreamingEdits, tx);
             entry.acceptStreamingEditsStart(responseModel, tx);
@@ -402,16 +413,28 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         });
     }
     async _acceptEdits(resource, textEdits, isLastEdits, responseModel) {
-        const entry = await this._getOrCreateModifiedFileEntry(resource, this._getTelemetryInfoForModel(responseModel));
+        const entry = await this._getOrCreateModifiedFileEntry(resource, NotExistBehavior.Create, this._getTelemetryInfoForModel(responseModel));
         await entry.acceptAgentEdits(resource, textEdits, isLastEdits, responseModel);
     }
     _getTelemetryInfoForModel(responseModel) {
         return new class {
             get agentId() { return responseModel.agent?.id; }
+            get modelId() { return responseModel.request?.modelId; }
+            get modeId() { return responseModel.request?.modeInfo?.modeId; }
             get command() { return responseModel.slashCommand?.name; }
             get sessionId() { return responseModel.session.sessionId; }
             get requestId() { return responseModel.requestId; }
             get result() { return responseModel.result; }
+            get applyCodeBlockSuggestionId() { return responseModel.request?.modeInfo?.applyCodeBlockSuggestionId; }
+            get feature() {
+                if (responseModel.session.initialLocation === ChatAgentLocation.Panel) {
+                    return 'sideBarChat';
+                }
+                else if (responseModel.session.initialLocation === ChatAgentLocation.Editor) {
+                    return 'inlineChat';
+                }
+                return responseModel.session.initialLocation;
+            }
         };
     }
     async _resolve(requestId, undoStop, resource) {
@@ -426,7 +449,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         this._timeline.ensureEditInUndoStopMatches(requestId, undoStop, entry,  true, undefined);
         return entry.acceptStreamingEditsEnd();
     }
-    async _getOrCreateModifiedFileEntry(resource, telemetryInfo) {
+    async _getOrCreateModifiedFileEntry(resource, ifNotExists, telemetryInfo) {
         resource = CellUri.parse(resource)?.notebook ?? resource;
         const existingEntry = this._entriesObs.get().find(e => isEqual(e.modifiedURI, resource));
         if (existingEntry) {
@@ -439,10 +462,17 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         const existingExternalEntry = this._lookupExternalEntry(resource);
         if (existingExternalEntry) {
             entry = existingExternalEntry;
+            if (telemetryInfo.requestId !== entry.telemetryInfo.requestId) {
+                entry.updateTelemetryInfo(telemetryInfo);
+            }
         }
         else {
             const initialContent = this._initialFileContents.get(resource);
-            entry = await this._createModifiedFileEntry(resource, telemetryInfo, false, initialContent);
+            const maybeEntry = await this._createModifiedFileEntry(resource, telemetryInfo, ifNotExists, initialContent);
+            if (!maybeEntry) {
+                return undefined;
+            }
+            entry = maybeEntry;
             if (!initialContent) {
                 this._initialFileContents.set(resource, entry.initialContent);
             }
@@ -461,11 +491,10 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         this._entriesObs.set(entriesArr, undefined);
         return entry;
     }
-    async _createModifiedFileEntry(resource, telemetryInfo, mustExist = false, initialContent) {
+    async _createModifiedFileEntry(resource, telemetryInfo, ifNotExists, initialContent) {
         const multiDiffEntryDelegate = { collapse: (transaction) => this._collapse(resource, transaction) };
-        const chatKind = mustExist ? ChatEditKind.Created : ChatEditKind.Modified;
         const notebookUri = CellUri.parse(resource)?.notebook || resource;
-        try {
+        const doCreate = async (chatKind) => {
             if (this._notebookService.hasSupportedNotebooks(notebookUri)) {
                 return await ChatEditingModifiedNotebookEntry.create(notebookUri, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent, this._instantiationService);
             }
@@ -473,10 +502,13 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
                 const ref = await this._textModelService.createModelReference(resource);
                 return this._instantiationService.createInstance(ChatEditingModifiedDocumentEntry, ref, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent);
             }
+        };
+        try {
+            return await doCreate(ChatEditKind.Modified);
         }
         catch (err) {
-            if (mustExist) {
-                throw err;
+            if (ifNotExists === NotExistBehavior.Abort) {
+                return undefined;
             }
             await this._bulkEditService.apply({ edits: [{ newResource: resource }] });
             this._editorService.openEditor({ resource, options: { inactive: true, preserveFocus: true, pinned: true } });
@@ -484,7 +516,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
                 return await ChatEditingModifiedNotebookEntry.create(resource, multiDiffEntryDelegate, telemetryInfo, ChatEditKind.Created, initialContent, this._instantiationService);
             }
             else {
-                return this._createModifiedFileEntry(resource, telemetryInfo, true, initialContent);
+                return await doCreate(ChatEditKind.Created);
             }
         }
     }

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

@@ -65,7 +65,17 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                 current: await getFileContent(entry.currentHash),
                 state: entry.state,
                 snapshotUri: ( URI.parse(entry.snapshotUri)),
-                telemetryInfo: { requestId: entry.telemetryInfo.requestId, agentId: entry.telemetryInfo.agentId, command: entry.telemetryInfo.command, sessionId: this.chatSessionId, result: undefined }
+                telemetryInfo: {
+                    requestId: entry.telemetryInfo.requestId,
+                    agentId: entry.telemetryInfo.agentId,
+                    command: entry.telemetryInfo.command,
+                    sessionId: this.chatSessionId,
+                    result: undefined,
+                    modelId: entry.telemetryInfo.modelId,
+                    modeId: entry.telemetryInfo.modeId,
+                    applyCodeBlockSuggestionId: entry.telemetryInfo.applyCodeBlockSuggestionId,
+                    feature: entry.telemetryInfo.feature,
+                }
             };
         };
         try {
@@ -167,7 +177,7 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                 currentHash: await addFileContent(entry.current),
                 state: entry.state,
                 snapshotUri: ( entry.snapshotUri.toString()),
-                telemetryInfo: { requestId: entry.telemetryInfo.requestId, agentId: entry.telemetryInfo.agentId, command: entry.telemetryInfo.command }
+                telemetryInfo: { requestId: entry.telemetryInfo.requestId, agentId: entry.telemetryInfo.agentId, command: entry.telemetryInfo.command, modelId: entry.telemetryInfo.modelId, modeId: entry.telemetryInfo.modeId }
             };
         };
         try {

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

@@ -9,11 +9,15 @@ import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
 import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-type acceptedOrRejectedLines = {
-    state: "accepted" | "rejected";
+type affectedLines = {
+    linesAdded: number;
+    linesRemoved: number;
     lineCount: number;
     hasRemainingEdits: boolean;
 };
+type acceptedOrRejectedLines = affectedLines & {
+    state: "accepted" | "rejected";
+};
 export declare class ChatEditingTextModelChangeService extends Disposable {
     private readonly originalModel;
     private readonly modifiedModel;
@@ -51,6 +55,8 @@ export declare class ChatEditingTextModelChangeService extends Disposable {
     readonly onDidUserEditModel: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     private _originalToModifiedEdit;
     private lineChangeCount;
+    private linesAdded;
+    private linesRemoved;
     constructor(originalModel: ITextModel, modifiedModel: ITextModel, state: IObservable<ModifiedFileEntryState>, _editorWorkerService: IEditorWorkerService, _accessibilitySignalService: IAccessibilitySignalService);
     private updateLineChangeCount;
     clearCurrentEditLineDecoration(): void;

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

@@ -13,7 +13,7 @@ import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/com
 import { StringEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/stringEdit';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
-import { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+import { TextEdit, VersionedExtensionId } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { ModelDecorationOptions } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
 import { offsetEditFromContentChanges, offsetEditToEditOperations, offsetEditFromLineRangeMapping } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModelStringEdit';
@@ -85,9 +85,9 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             };
         }));
     }
-    notifyHunkAction(state, lineCount, hasRemainingEdits) {
-        if (lineCount > 0) {
-            this._didAcceptOrRejectLines.fire({ state, lineCount, hasRemainingEdits });
+    notifyHunkAction(state, affectedLines) {
+        if (affectedLines.lineCount > 0) {
+            this._didAcceptOrRejectLines.fire({ state, ...affectedLines });
         }
     }
     constructor(originalModel, modifiedModel, state, _editorWorkerService, _accessibilitySignalService) {
@@ -114,6 +114,8 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         this.onDidUserEditModel = this._didUserEditModel.event;
         this._originalToModifiedEdit = StringEdit.empty;
         this.lineChangeCount = 0;
+        this.linesAdded = 0;
+        this.linesRemoved = 0;
         this._register(this.modifiedModel.onDidChangeContent(e => {
             this._mirrorEdits(e);
         }));
@@ -124,9 +126,13 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
     }
     updateLineChangeCount(diff) {
         this.lineChangeCount = 0;
+        this.linesAdded = 0;
+        this.linesRemoved = 0;
         for (const change of diff.changes) {
             const modifiedRange = change.modified.endLineNumberExclusive - change.modified.startLineNumber;
+            this.linesAdded += Math.max(0, modifiedRange);
             const originalRange = change.original.endLineNumberExclusive - change.original.startLineNumber;
+            this.linesRemoved += Math.max(0, originalRange);
             this.lineChangeCount += Math.max(modifiedRange, originalRange);
         }
     }
@@ -145,7 +151,18 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         let rewriteRatio = 0;
         const sessionId = responseModel.session.sessionId;
         const request = responseModel.session.getRequests().at(-1);
-        const source = EditSources.chatApplyEdits({ modelId: request?.modelId, requestId: request?.id, sessionId: sessionId });
+        const languageId = this.modifiedModel.getLanguageId();
+        const agent = responseModel.agent;
+        const extensionId = VersionedExtensionId.tryCreate(agent?.extensionId.value, agent?.extensionVersion);
+        const source = EditSources.chatApplyEdits({
+            modelId: request?.modelId,
+            requestId: request?.id,
+            sessionId: sessionId,
+            languageId,
+            mode: request?.modeInfo?.modeId,
+            extensionId,
+            codeBlockSuggestionId: request?.modeInfo?.applyCodeBlockSuggestionId,
+        });
         if (isAtomicEdits) {
             const minimalEdits = (await this._editorWorkerService.computeMoreMinimalEdits(this.modifiedModel.uri, textEdits)) ?? textEdits;
             const ops = ( minimalEdits.map(TextEdit.asEditOperation));
@@ -218,13 +235,13 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         }
     }
     keep() {
-        this.notifyHunkAction('accepted', this.lineChangeCount, false);
+        this.notifyHunkAction('accepted', { linesAdded: this.linesAdded, linesRemoved: this.linesRemoved, lineCount: this.lineChangeCount, hasRemainingEdits: false });
         this.originalModel.setValue(this.modifiedModel.createSnapshot());
         this._diffInfo.set(nullDocumentDiff, undefined);
         this._originalToModifiedEdit = StringEdit.empty;
     }
     undo() {
-        this.notifyHunkAction('rejected', this.lineChangeCount, false);
+        this.notifyHunkAction('rejected', { linesAdded: this.linesAdded, linesRemoved: this.linesRemoved, lineCount: this.lineChangeCount, hasRemainingEdits: false });
         this.modifiedModel.pushStackElement();
         this._applyEdits([(EditOperation.replace(this.modifiedModel.getFullModelRange(), this.originalModel.getValue()))], EditSources.chatUndoEdits());
         this.modifiedModel.pushStackElement();
@@ -309,12 +326,20 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         const myDiffOperationId = ++this._diffOperationIds;
         await Promise.resolve(this._diffOperation);
         const previousCount = this.lineChangeCount;
+        const previousAdded = this.linesAdded;
+        const previousRemoved = this.linesRemoved;
         if (this._diffOperationIds === myDiffOperationId) {
             const thisDiffOperation = this._updateDiffInfo();
             this._diffOperation = thisDiffOperation;
             await thisDiffOperation;
             if (notifyAction) {
-                this.notifyHunkAction(notifyAction, previousCount - this.lineChangeCount, this.lineChangeCount > 0);
+                const affectedLines = {
+                    linesAdded: previousAdded - this.linesAdded,
+                    linesRemoved: previousRemoved - this.linesRemoved,
+                    lineCount: previousCount - this.lineChangeCount,
+                    hasRemainingEdits: this.lineChangeCount > 0
+                };
+                this.notifyHunkAction(notifyAction, affectedLines);
             }
         }
     }

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

@@ -1,13 +1,13 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
-import { chatEditingSnapshotScheme } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 
 var ChatEditingTextModelContentProvider_1;
 let ChatEditingTextModelContentProvider = class ChatEditingTextModelContentProvider {
     static { ChatEditingTextModelContentProvider_1 = this; }
-    static { this.scheme = 'chat-editing-text-model'; }
+    static { this.scheme = Schemas.chatEditingModel; }
     static getFileURI(chatSessionId, documentId, path) {
         return ( URI.from({
             scheme: ChatEditingTextModelContentProvider_1.scheme,
@@ -39,7 +39,7 @@ ChatEditingTextModelContentProvider = ChatEditingTextModelContentProvider_1 = (
 let ChatEditingSnapshotTextModelContentProvider = class ChatEditingSnapshotTextModelContentProvider {
     static getSnapshotFileURI(chatSessionId, requestId, undoStop, path) {
         return ( URI.from({
-            scheme: chatEditingSnapshotScheme,
+            scheme: Schemas.chatEditingSnapshotScheme,
             path,
             query: JSON.stringify({ sessionId: chatSessionId, requestId: requestId ?? '', undoStop: undoStop ?? '' }),
         }));

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

@@ -96,4 +96,7 @@ export declare class ChatEditingTimeline {
     private _entryDiffBetweenTextStops;
     private _createDiffBetweenStopsObservable;
     getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined>;
+    getEntryDiffBetweenRequests(uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined>;
+    private _computeDiff;
+    private _getFirstSnapshotForUriAfterRequest;
 }

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

@@ -1,11 +1,11 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { equals, binarySearch2 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { equals as equals$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { findLast } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
-import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { DisposableStore, thenRegisterOrDispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { equals as equals$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
@@ -239,23 +239,7 @@ let ChatEditingTimeline = class ChatEditingTimeline {
                 return ( new ObservablePromise(diffService.computeDiff()));
             }
             const ignoreTrimWhitespace = this._ignoreTrimWhitespaceObservable.read(reader);
-            const promise = this._editorWorkerService.computeDiff(refs[0].object.textEditorModel.uri, refs[1].object.textEditorModel.uri, { ignoreTrimWhitespace, computeMoves: false, maxComputationTimeMs: 3000 }, 'advanced').then((diff) => {
-                const entryDiff = {
-                    originalURI: refs[0].object.textEditorModel.uri,
-                    modifiedURI: refs[1].object.textEditorModel.uri,
-                    identical: !!diff?.identical,
-                    quitEarly: !diff || diff.quitEarly,
-                    added: 0,
-                    removed: 0,
-                };
-                if (diff) {
-                    for (const change of diff.changes) {
-                        entryDiff.removed += change.original.endLineNumberExclusive - change.original.startLineNumber;
-                        entryDiff.added += change.modified.endLineNumberExclusive - change.modified.startLineNumber;
-                    }
-                }
-                return entryDiff;
-            });
+            const promise = this._computeDiff(refs[0].object.textEditorModel.uri, refs[1].object.textEditorModel.uri, ignoreTrimWhitespace);
             return ( new ObservablePromise(promise));
         });
     }
@@ -308,6 +292,77 @@ let ChatEditingTimeline = class ChatEditingTimeline {
             return observable;
         }
     }
+    getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId) {
+        const snapshotUris = derivedOpts({ equalsFn: (a, b) => equals(a, b, isEqual) }, reader => {
+            const history = this._linearHistory.read(reader);
+            const firstSnapshotUri = this._getFirstSnapshotForUriAfterRequest(history, uri, startRequestId, true);
+            const lastSnapshotUri = this._getFirstSnapshotForUriAfterRequest(history, uri, stopRequestId, false);
+            return [firstSnapshotUri, lastSnapshotUri];
+        });
+        const modelRefs = derived((reader) => {
+            const snapshots = snapshotUris.read(reader);
+            const firstSnapshotUri = snapshots[0];
+            const lastSnapshotUri = snapshots[1];
+            if (!firstSnapshotUri || !lastSnapshotUri) {
+                return;
+            }
+            const store = ( new DisposableStore());
+            reader.store.add(store);
+            const referencesPromise = Promise.all(( [firstSnapshotUri, lastSnapshotUri].map(u => {
+                return thenRegisterOrDispose(this._textModelService.createModelReference(u), store);
+            })));
+            return ( new ObservablePromise(referencesPromise));
+        });
+        const diff = derived((reader) => {
+            const references = modelRefs.read(reader)?.promiseResult.read(reader);
+            const refs = references?.data;
+            if (!refs) {
+                return;
+            }
+            const ignoreTrimWhitespace = this._ignoreTrimWhitespaceObservable.read(reader);
+            const promise = this._computeDiff(refs[0].object.textEditorModel.uri, refs[1].object.textEditorModel.uri, ignoreTrimWhitespace);
+            return ( new ObservablePromise(promise));
+        });
+        return derived(reader => {
+            return diff.read(reader)?.promiseResult.read(reader)?.data || undefined;
+        });
+    }
+    _computeDiff(originalUri, modifiedUri, ignoreTrimWhitespace) {
+        return this._editorWorkerService.computeDiff(originalUri, modifiedUri, { ignoreTrimWhitespace, computeMoves: false, maxComputationTimeMs: 3000 }, 'advanced').then((diff) => {
+            const entryDiff = {
+                originalURI: originalUri,
+                modifiedURI: modifiedUri,
+                identical: !!diff?.identical,
+                quitEarly: !diff || diff.quitEarly,
+                added: 0,
+                removed: 0,
+            };
+            if (diff) {
+                for (const change of diff.changes) {
+                    entryDiff.removed += change.original.endLineNumberExclusive - change.original.startLineNumber;
+                    entryDiff.added += change.modified.endLineNumberExclusive - change.modified.startLineNumber;
+                }
+            }
+            return entryDiff;
+        });
+    }
+    _getFirstSnapshotForUriAfterRequest(history, uri, requestId, inclusive) {
+        const requestIndex = history.findIndex(s => s.requestId === requestId);
+        if (requestIndex === -1) {
+            return undefined;
+        }
+        const processedIndex = requestIndex + (inclusive ? 0 : 1);
+        for (let i = processedIndex; i < history.length; i++) {
+            const snapshot = history[i];
+            for (const stop of snapshot.stops) {
+                const entry = stop.entries.get(uri);
+                if (entry) {
+                    return entry.snapshotUri;
+                }
+            }
+        }
+        return uri;
+    }
 };
 ChatEditingTimeline = ChatEditingTimeline_1 = ( __decorate([
     ( __param(0, IEditorWorkerService)),

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

@@ -2,7 +2,7 @@
 import { VSBuffer, encodeBase64, decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { filter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { NotebookCellTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { NotebookSetting, CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 

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

@@ -553,12 +553,12 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             modified: { resource: this._entry.modifiedURI },
             label: defaultAgentName
                 ? ( localize(
-                4966,
+                5058,
                 '{0} (changes from {1})',
                 basename(this._entry.modifiedURI),
                 defaultAgentName
             ))
-                : ( localize(4967, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                : ( localize(5059, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }