@codingame/monaco-vscode-chat-service-override 28.4.0 → 29.0.0

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

@@ -1,6 +1,9 @@
 
-import { $ as $$1, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $ as $$1, append, addDisposableListener, EventType, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
+import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { createTrustedTypesPolicy } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/trustedTypes';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { tokenizeToString } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/textToHtmlTokenizer';
@@ -24,18 +27,55 @@ function tryParseJSON(text) {
         };
     }
 }
+async function tokenizeContent(text, languageService) {
+    const result = tryParseJSON(text);
+    const plainText = result.isJSON ? JSON.stringify(result.parsed, null, 2) : text;
+    const language = result.isJSON ? "json" : "markdown";
+    const tokenizedHtml = await tokenizeToString(languageService, plainText, language);
+    return {
+        plainText,
+        tokenizedHtml
+    };
+}
 function renderSection(
     parent,
     label,
     plainText,
     tokenizedHtml,
     disposables,
-    initiallyCollapsed = false
+    initiallyCollapsed = false,
+    clipboardService,
+    scrollable
 ) {
     const sectionEl = append(parent, $("div.chat-debug-message-section"));
     const header = append(sectionEl, $("div.chat-debug-message-section-header"));
     const chevron = append(header, $("span.chat-debug-message-section-chevron"));
     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")),
+            hoverDelegate: getDefaultHoverDelegate("mouse")
+        })));
+        copyBtn.icon = Codicon.copy;
+        copyBtn.element.classList.add("chat-debug-section-copy-btn");
+        disposables.add(
+            addDisposableListener(copyBtn.element, EventType.MOUSE_ENTER, () => {
+                header.classList.add("chat-debug-section-copy-header-passthrough");
+            })
+        );
+        disposables.add(
+            addDisposableListener(copyBtn.element, EventType.MOUSE_LEAVE, () => {
+                header.classList.remove("chat-debug-section-copy-header-passthrough");
+            })
+        );
+        disposables.add(copyBtn.onDidClick(e => {
+            if (e) {
+                EventHelper.stop(e, true);
+            }
+            clipboardService.writeText(plainText);
+        }));
+    }
     const wrapper = append(sectionEl, $("div.chat-debug-message-section-content-wrapper"));
     const contentEl = append(wrapper, $("pre.chat-debug-message-section-content"));
     contentEl.tabIndex = 0;
@@ -45,9 +85,9 @@ function renderSection(
     } else {
         contentEl.textContent = plainText;
     }
-    setupCollapsibleToggle(chevron, header, wrapper, disposables, initiallyCollapsed);
+    setupCollapsibleToggle(chevron, header, wrapper, disposables, initiallyCollapsed, scrollable);
 }
-async function renderToolCallContent(content, languageService) {
+async function renderToolCallContent(content, languageService, clipboardService, scrollable) {
     const disposables = ( new DisposableStore());
     const container = $("div.chat-debug-message-content");
     container.tabIndex = 0;
@@ -57,10 +97,10 @@ async function renderToolCallContent(content, languageService) {
     );
     const statusParts = [];
     if (content.result) {
-        statusParts.push(content.result === "success" ? ( localize(5779, "Success")) : ( localize(5780, "Error")));
+        statusParts.push(content.result === "success" ? ( localize(5910, "Success")) : ( localize(5911, "Error")));
     }
     if (content.durationInMillis !== undefined) {
-        statusParts.push(( localize(5781, "{0}ms", content.durationInMillis)));
+        statusParts.push(( localize(5912, "{0}ms", content.durationInMillis)));
     }
     if (statusParts.length > 0) {
         append(container, $(
@@ -71,16 +111,18 @@ async function renderToolCallContent(content, languageService) {
     }
     const sectionsContainer = append(container, $("div.chat-debug-message-sections"));
     if (content.input) {
-        const result = tryParseJSON(content.input);
-        const plainText = result.isJSON ? JSON.stringify(result.parsed, null, 2) : content.input;
-        const tokenizedHtml = result.isJSON ? await tokenizeToString(languageService, plainText, "json") : undefined;
-        renderSection(sectionsContainer, ( localize(5782, "Arguments")), plainText, tokenizedHtml, disposables);
+        const {
+            plainText,
+            tokenizedHtml
+        } = await tokenizeContent(content.input, languageService);
+        renderSection(sectionsContainer, ( localize(5913, "Arguments")), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
     }
     if (content.output) {
-        const result = tryParseJSON(content.output);
-        const plainText = result.isJSON ? JSON.stringify(result.parsed, null, 2) : content.output;
-        const tokenizedHtml = result.isJSON ? await tokenizeToString(languageService, plainText, "json") : undefined;
-        renderSection(sectionsContainer, ( localize(5783, "Output")), plainText, tokenizedHtml, disposables);
+        const {
+            plainText,
+            tokenizedHtml
+        } = await tokenizeContent(content.output, languageService);
+        renderSection(sectionsContainer, ( localize(5914, "Output")), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
     }
     return {
         element: container,
@@ -89,16 +131,16 @@ async function renderToolCallContent(content, languageService) {
 }
 function toolCallContentToPlainText(content) {
     const lines = [];
-    lines.push(( localize(5784, "Tool: {0}", content.toolName)));
+    lines.push(( localize(5915, "Tool: {0}", content.toolName)));
     if (content.result) {
-        lines.push(( localize(5785, "Status: {0}", content.result)));
+        lines.push(( localize(5916, "Status: {0}", content.result)));
     }
     if (content.durationInMillis !== undefined) {
-        lines.push(( localize(5786, "Duration: {0}ms", content.durationInMillis)));
+        lines.push(( localize(5917, "Duration: {0}ms", content.durationInMillis)));
     }
     if (content.input) {
         lines.push("");
-        lines.push(`[${( localize(5782, "Arguments"))}]`);
+        lines.push(`[${( localize(5913, "Arguments"))}]`);
         try {
             const parsed = JSON.parse(content.input);
             lines.push(JSON.stringify(parsed, null, 2));
@@ -108,7 +150,7 @@ function toolCallContentToPlainText(content) {
     }
     if (content.output) {
         lines.push("");
-        lines.push(`[${( localize(5783, "Output"))}]`);
+        lines.push(`[${( localize(5914, "Output"))}]`);
         try {
             const parsed = JSON.parse(content.output);
             lines.push(JSON.stringify(parsed, null, 2));
@@ -119,4 +161,4 @@ function toolCallContentToPlainText(content) {
     return lines.join("\n");
 }
 
-export { renderToolCallContent, toolCallContentToPlainText };
+export { renderSection, renderToolCallContent, tokenizeContent, toolCallContentToPlainText, tryParseJSON };

package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/media/chatDebug.css

@@ -331,11 +331,16 @@
 .chat-debug-table-header .chat-debug-col-details {
 	flex: 1;
 }
+.chat-debug-logs-main > .monaco-progress-container {
+	height: 2px;
+	flex-shrink: 0;
+}
 .chat-debug-logs-content {
 	display: flex;
 	flex-direction: row;
 	flex: 1;
 	overflow: hidden;
+	position: relative;
 }
 .chat-debug-logs-main {
 	display: flex;
@@ -401,34 +406,8 @@
 .chat-debug-log-row.chat-debug-log-trace {
 	opacity: 0.7;
 }
-.chat-debug-logs-shimmer-row {
-	position: absolute;
-	left: 0;
-	right: 0;
-	display: flex;
-	align-items: center;
-	padding: 0 16px;
-	height: 28px;
-	gap: 40px;
-	pointer-events: none;
-}
-.chat-debug-logs-shimmer-bar {
-	flex: 1;
-	height: 10px;
-	border-radius: 3px;
-	background: linear-gradient(
-		90deg,
-		var(--vscode-descriptionForeground) 25%,
-		var(--vscode-chat-thinkingShimmer, rgba(255, 255, 255, 0.3)) 50%,
-		var(--vscode-descriptionForeground) 75%
-	);
-	background-size: 200% 100%;
-	animation: chat-debug-shimmer 2s linear infinite;
-	opacity: 0.15;
-}
 .chat-debug-detail-panel {
 	flex-shrink: 0;
-	width: 350px;
 	display: flex;
 	flex-direction: column;
 	border-left: 1px solid var(--vscode-widget-border, var(--vscode-panel-border));
@@ -461,11 +440,6 @@
 	opacity: 1;
 	background: var(--vscode-toolbar-hoverBackground);
 }
-.chat-debug-detail-content {
-	flex: 1;
-	min-height: 0;
-	overflow-y: auto;
-}
 .chat-debug-detail-panel pre {
 	margin: 0;
 	padding: 8px 16px;
@@ -643,8 +617,6 @@
 }
 .chat-debug-message-section-content-wrapper {
 	border-top: 1px solid var(--vscode-widget-border, transparent);
-	max-height: 300px;
-	overflow-y: auto;
 }
 .chat-debug-message-section-content {
 	margin: 0;
@@ -666,7 +638,8 @@
 }
 
 /* ---- File list: settings gear button ---- */
-.chat-debug-settings-gear.monaco-button {
+.chat-debug-settings-gear.monaco-button,
+.chat-debug-section-copy-btn.monaco-button {
 	flex-shrink: 0;
 	opacity: 0.7;
 	border-radius: 3px;
@@ -676,14 +649,17 @@
 	color: inherit;
 	min-width: auto;
 }
-.chat-debug-settings-gear.monaco-button:hover {
+.chat-debug-settings-gear.monaco-button:hover,
+.chat-debug-section-copy-btn.monaco-button:hover {
 	opacity: 1;
 	background: var(--vscode-toolbar-hoverBackground);
 }
-.chat-debug-settings-gear-header-passthrough {
+.chat-debug-settings-gear-header-passthrough,
+.chat-debug-section-copy-header-passthrough {
 	pointer-events: none;
 }
-.chat-debug-settings-gear-header-passthrough .chat-debug-settings-gear {
+.chat-debug-settings-gear-header-passthrough .chat-debug-settings-gear,
+.chat-debug-section-copy-header-passthrough .chat-debug-section-copy-btn {
 	pointer-events: auto;
 }
 
@@ -727,6 +703,14 @@
 	display: flex;
 	flex: 1;
 	overflow: hidden;
+	position: relative;
+}
+.chat-debug-flowchart-content-wrapper > .chat-debug-detail-panel {
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 10;
 }
 .chat-debug-flowchart-content {
 	flex: 1;

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

@@ -620,7 +620,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 options: {
                     selection
                 },
-                label: ( localize(5822, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+                label: ( localize(5953, "{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.js

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
 import { DetailedLineRangeMapping } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
@@ -110,7 +111,7 @@ let ChatEditingDeletedFileEntry = class ChatEditingDeletedFileEntry extends Abst
         return Promise.resolve(this._diffInfo());
     }
     equalsSnapshot(snapshot) {
-        return !!snapshot && ( this.modifiedURI.toString()) === ( snapshot.resource.toString()) && this._languageId === snapshot.languageId && this._originalContent === snapshot.original && snapshot.current === "" && this.state.get() === snapshot.state;
+        return !!snapshot && isEqual(this.modifiedURI, snapshot.resource) && this._languageId === snapshot.languageId && this._originalContent === snapshot.original && snapshot.current === "" && this.state.get() === snapshot.state;
     }
     createSnapshot(chatSessionResource, requestId, undoStop) {
         return {

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(5858, "No language model available"))
+                        errorMessage: ( localize(5989, "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(5859, "Code was modified."));
+                    const parsedExplanation = parsed[parsedIndex]?.explanation?.trim() || ( localize(5990, "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(5860, "Failed to generate explanations"));
+                const errorMessage = e instanceof Error ? e.message : ( localize(5991, "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.js

@@ -3,6 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/textEdit';
@@ -141,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(5873, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(6004, "Chat Edits")));
             } else {
                 resourceFilter.clear();
             }
@@ -151,7 +152,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         return this._textModelChangeService.getDiffInfo();
     }
     equalsSnapshot(snapshot) {
-        return !!snapshot && ( this.modifiedURI.toString()) === ( snapshot.resource.toString()) && this.modifiedModel.getLanguageId() === snapshot.languageId && this.originalModel.getValue() === snapshot.original && this.modifiedModel.getValue() === snapshot.current && this.state.get() === snapshot.state;
+        return !!snapshot && isEqual(this.modifiedURI, snapshot.resource) && this.modifiedModel.getLanguageId() === snapshot.languageId && this.originalModel.getValue() === snapshot.original && this.modifiedModel.getValue() === snapshot.current && this.state.get() === snapshot.state;
     }
     createSnapshot(chatSessionResource, requestId, undoStop) {
         return {
@@ -183,7 +184,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(5874, "Chat Edit: '{0}'", request.message.text)) : ( localize(5875, "Chat Edit"));
+        const label = request?.message.text ? ( localize(6005, "Chat Edit: '{0}'", request.message.text)) : ( localize(6006, "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

@@ -70,7 +70,7 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     get lastModifyingRequestId(): string;
     private _refCounter;
     readonly abstract originalURI: URI;
-    protected readonly _userEditScheduler: RunOnceScheduler;
+    protected readonly _userEditScheduler: RunOnceScheduler<() => void>;
     constructor(modifiedURI: URI, _telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, configService: IConfigurationService, _fileConfigService: IFilesConfigurationService, _chatService: IChatService, _fileService: IFileService, _undoRedoService: IUndoRedoService, _instantiationService: IInstantiationService, _aiEditTelemetryService: IAiEditTelemetryService);
     dispose(): void;
     acquire(): this;

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(5876, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(6007, "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

@@ -104,6 +104,7 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     private keepPreviouslyDeletedCell;
     private _applyEdits;
     private _applyEditsSync;
+    private _safeCreateSnapshot;
     getCurrentSnapshot(): string;
     createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
     equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;

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

@@ -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(5877, "Chat Edit: '{0}'", request.message.text)) : ( localize(5878, "Chat Edit"));
+        const label = request?.message.text ? ( localize(6008, "Chat Edit: '{0}'", request.message.text)) : ( localize(6009, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
@@ -883,10 +883,23 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             this._isEditFromUs = false;
         }
     }
+    _safeCreateSnapshot(model) {
+        try {
+            return createSnapshot(model, this.transientOptions, this.configurationService);
+        } catch (e) {
+            this.loggingService.error(
+                "Notebook Chat",
+                `Error creating snapshot: ${e instanceof Error ? e.message : e}`
+            );
+            return this.initialContent;
+        }
+    }
     getCurrentSnapshot() {
-        return createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
+        return this._safeCreateSnapshot(this.modifiedModel);
     }
     createSnapshot(chatSessionResource, requestId, undoStop) {
+        const original = this._safeCreateSnapshot(this.originalModel);
+        const current = this.getCurrentSnapshot();
         return {
             resource: this.modifiedURI,
             languageId: SnapshotLanguageId,
@@ -897,8 +910,8 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
                 this.modifiedURI.path,
                 this.modifiedModel.viewType
             ),
-            original: createSnapshot(this.originalModel, this.transientOptions, this.configurationService),
-            current: createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService),
+            original,
+            current,
             state: this.state.get(),
             telemetryInfo: this.telemetryInfo
         };

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

@@ -124,7 +124,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: "join.chatEditingSession",
-                label: ( localize(5879, "Saving chat edits history"))
+                label: ( localize(6010, "Saving chat edits history"))
             });
         }));
     }
@@ -346,7 +346,7 @@ class ChatDecorationsProvider extends Disposable {
     constructor(_sessions) {
         super();
         this._sessions = _sessions;
-        this.label = ( localize(5880, "Chat Editing"));
+        this.label = ( localize(6011, "Chat Editing"));
         this._currentEntries = derived(this, r => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -377,7 +377,7 @@ class ChatDecorationsProvider extends Disposable {
         );
     }
     provideDecorations(uri, _token) {
-        const isCurrentlyBeingModified = ( this._currentlyEditingUris.get().some(e => ( e.toString()) === ( uri.toString())));
+        const isCurrentlyBeingModified = ( this._currentlyEditingUris.get().some(e => isEqual(e, uri)));
         if (isCurrentlyBeingModified) {
             return {
                 weight: 1000,
@@ -385,12 +385,12 @@ class ChatDecorationsProvider extends Disposable {
                 bubble: false
             };
         }
-        const isModified = ( this._modifiedUris.get().some(e => ( e.toString()) === ( uri.toString())));
+        const isModified = ( this._modifiedUris.get().some(e => isEqual(e, uri)));
         if (isModified) {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: ( localize(5881, "Pending changes from chat")),
+                tooltip: ( localize(6012, "Pending changes from chat")),
                 bubble: true
             };
         }

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

@@ -12,6 +12,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.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";
@@ -37,6 +38,7 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private readonly configurationService;
     private readonly _fileService;
     private readonly _explanationModelManager;
+    private readonly _telemetryService;
     private readonly _state;
     private readonly _timeline;
     /**
@@ -60,7 +62,7 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     get requestDisablement(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel").IChatRequestDisablement[]>;
     private readonly _onDidDispose;
     get onDidDispose(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
-    constructor(chatSessionResource: URI, isGlobalEditingSession: boolean, _lookupExternalEntry: (uri: URI) => AbstractChatEditingModifiedFileEntry | undefined, transferFrom: IChatEditingSession | undefined, _instantiationService: IInstantiationService, _modelService: IModelService, _languageService: ILanguageService, _textModelService: ITextModelService, _bulkEditService: IBulkEditService, _editorGroupsService: IEditorGroupsService, _editorService: IEditorService, _notebookService: INotebookService, _accessibilitySignalService: IAccessibilitySignalService, _logService: ILogService, configurationService: IConfigurationService, _fileService: IFileService, _explanationModelManager: IChatEditingExplanationModelManager);
+    constructor(chatSessionResource: URI, isGlobalEditingSession: boolean, _lookupExternalEntry: (uri: URI) => AbstractChatEditingModifiedFileEntry | undefined, transferFrom: IChatEditingSession | undefined, _instantiationService: IInstantiationService, _modelService: IModelService, _languageService: ILanguageService, _textModelService: ITextModelService, _bulkEditService: IBulkEditService, _editorGroupsService: IEditorGroupsService, _editorService: IEditorService, _notebookService: INotebookService, _accessibilitySignalService: IAccessibilitySignalService, _logService: ILogService, configurationService: IConfigurationService, _fileService: IFileService, _explanationModelManager: IChatEditingExplanationModelManager, _telemetryService: ITelemetryService);
     private _getTimelineDelegate;
     private _init;
     private _getEntry;
@@ -105,6 +107,7 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private _initEntries;
     private _acceptEdits;
     private _getTelemetryInfoForModel;
+    private _countEntryStates;
     private _resolve;
     /**
      * Retrieves or creates a modified file entry.

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

@@ -26,6 +26,7 @@ import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -39,7 +40,7 @@ import { ChatEditingDeletedFileEntry } from './chatEditingDeletedFileEntry.js';
 import { ChatEditingModifiedDocumentEntry } from './chatEditingModifiedDocumentEntry.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
-import { FileOperationType } from './chatEditingOperations.js';
+import { getKeyForChatSessionResource, FileOperationType } from './chatEditingOperations.js';
 import { IChatEditingExplanationModelManager } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.service';
 import { ChatEditingSessionStorage } from './chatEditingSessionStorage.js';
 import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
@@ -131,7 +132,8 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         _logService,
         configurationService,
         _fileService,
-        _explanationModelManager
+        _explanationModelManager,
+        _telemetryService
     ) {
         super();
         this.chatSessionResource = chatSessionResource;
@@ -150,6 +152,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         this.configurationService = configurationService;
         this._fileService = _fileService;
         this._explanationModelManager = _explanationModelManager;
+        this._telemetryService = _telemetryService;
         this._state = observableValue(this, ChatEditingSessionState.Initial);
         this._initialFileContents = ( new ResourceMap());
         this._baselineCreationLocks = ( new SequencerByKey());
@@ -275,7 +278,12 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
     }
     storeState() {
         const storage = this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionResource);
-        return storage.storeState(this._getStoredState());
+        const storedState = this._getStoredState();
+        this._telemetryService.publicLog2("chatEditing/sessionStore", {
+            editSessionId: getKeyForChatSessionResource(this.chatSessionResource),
+            ...this._countEntryStates(this._entriesObs.get())
+        });
+        return storage.storeState(storedState);
     }
     _getStoredState(sessionResource = this.chatSessionResource) {
         const entries = ( new ResourceMap());
@@ -399,7 +407,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(5882, "Suggested Edits"))
+            label: ( localize(6013, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorService.openEditor(input, {
             pinned: true,
@@ -805,6 +813,10 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
             }
         }
         this._entriesObs.set(entriesArr, undefined);
+        this._telemetryService.publicLog2("chatEditing/sessionRestore", {
+            editSessionId: getKeyForChatSessionResource(this.chatSessionResource),
+            ...this._countEntryStates(entriesArr)
+        });
     }
     async _acceptEdits(resource, textEdits, isLastEdits, responseModel) {
         const entry = await this._getOrCreateModifiedFileEntry(
@@ -853,6 +865,32 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
             }
         }();
     }
+    _countEntryStates(entries) {
+        let entryCount = 0;
+        let modifiedCount = 0;
+        let acceptedCount = 0;
+        let rejectedCount = 0;
+        for (const entry of entries) {
+            entryCount += 1;
+            switch (entry.state.get()) {
+            case ModifiedFileEntryState.Modified:
+                modifiedCount += 1;
+                break;
+            case ModifiedFileEntryState.Accepted:
+                acceptedCount += 1;
+                break;
+            case ModifiedFileEntryState.Rejected:
+                rejectedCount += 1;
+                break;
+            }
+        }
+        return {
+            entryCount,
+            modifiedCount,
+            acceptedCount,
+            rejectedCount
+        };
+    }
     async _resolve(requestId, undoStop, resource) {
         const hasOtherTasks = ( Iterable.some(( this._streamingEditLocks.keys()), k => k !== ( resource.toString())));
         if (!hasOtherTasks) {
@@ -1000,6 +1038,6 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         }
     }
 };
-ChatEditingSession = ChatEditingSession_1 = ( __decorate([( __param(4, IInstantiationService)), ( __param(5, IModelService)), ( __param(6, ILanguageService)), ( __param(7, ITextModelService)), ( __param(8, IBulkEditService)), ( __param(9, IEditorGroupsService)), ( __param(10, IEditorService)), ( __param(11, INotebookService)), ( __param(12, IAccessibilitySignalService)), ( __param(13, ILogService)), ( __param(14, IConfigurationService)), ( __param(15, IFileService)), ( __param(16, IChatEditingExplanationModelManager))], ChatEditingSession));
+ChatEditingSession = ChatEditingSession_1 = ( __decorate([( __param(4, IInstantiationService)), ( __param(5, IModelService)), ( __param(6, ILanguageService)), ( __param(7, ITextModelService)), ( __param(8, IBulkEditService)), ( __param(9, IEditorGroupsService)), ( __param(10, IEditorService)), ( __param(11, INotebookService)), ( __param(12, IAccessibilitySignalService)), ( __param(13, ILogService)), ( __param(14, IConfigurationService)), ( __param(15, IFileService)), ( __param(16, IChatEditingExplanationModelManager)), ( __param(17, ITelemetryService))], ChatEditingSession));
 
 export { ChatEditingSession };

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

@@ -630,7 +630,7 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             modified: {
                 resource: this._entry.modifiedURI
             },
-            label: ( localize(5883, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+            label: ( localize(6014, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }