@codingame/monaco-vscode-chat-service-override 27.0.0 → 28.0.0

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

@@ -95,7 +95,7 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
             return;
         }
         const sessionTitle = this.chatService.getSessionTitle(this.currentSessionResource) || LocalChatSessionUri.parseLocalSessionId(this.currentSessionResource) || ( this.currentSessionResource.toString());
-        this.breadcrumbWidget.setItems([( new TextBreadcrumbItem(( localize(5686, "Agent Debug Panel")), true)), ( new TextBreadcrumbItem(sessionTitle))]);
+        this.breadcrumbWidget.setItems([( new TextBreadcrumbItem(( localize(5755, "Agent Debug Panel")), true)), ( new TextBreadcrumbItem(sessionTitle))]);
     }
     load() {
         clearNode(this.content);
@@ -111,8 +111,8 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
         titleEl.append(sessionTitle);
         const titleActions = append(titleRow, $(".chat-debug-overview-title-actions"));
         const revealSessionBtn = this.loadDisposables.add(( new Button(titleActions, {
-            ariaLabel: ( localize(5687, "Reveal Chat Session")),
-            title: ( localize(5687, "Reveal Chat Session"))
+            ariaLabel: ( localize(5756, "Reveal Chat Session")),
+            title: ( localize(5756, "Reveal Chat Session"))
         })));
         revealSessionBtn.element.classList.add("chat-debug-icon-button");
         revealSessionBtn.icon = Codicon.goToFile;
@@ -131,36 +131,36 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
         const details = [];
         const sessionType = getChatSessionType(sessionUri);
         const contribution = this.chatSessionsService.getChatSessionContribution(sessionType);
-        const sessionTypeName = contribution?.displayName || (sessionType === "local" ? ( localize(5688, "Local")) : sessionType);
+        const sessionTypeName = contribution?.displayName || (sessionType === "local" ? ( localize(5757, "Local")) : sessionType);
         details.push({
-            label: ( localize(5689, "Session Type")),
+            label: ( localize(5758, "Session Type")),
             value: sessionTypeName
         });
         if (model) {
             const locationLabel = this.getLocationLabel(model.initialLocation);
             details.push({
-                label: ( localize(5690, "Location")),
+                label: ( localize(5759, "Location")),
                 value: locationLabel
             });
             const inProgress = model.requestInProgress.get();
-            const statusLabel = inProgress ? ( localize(5691, "In Progress")) : ( localize(5692, "Idle"));
+            const statusLabel = inProgress ? ( localize(5760, "In Progress")) : ( localize(5761, "Idle"));
             details.push({
-                label: ( localize(5693, "Status")),
+                label: ( localize(5762, "Status")),
                 value: statusLabel
             });
             const timing = model.timing;
             details.push({
-                label: ( localize(5694, "Created")),
+                label: ( localize(5763, "Created")),
                 value: ( new Date(timing.created)).toLocaleString()
             });
             if (timing.lastRequestEnded) {
                 details.push({
-                    label: ( localize(5695, "Last Activity")),
+                    label: ( localize(5764, "Last Activity")),
                     value: ( new Date(timing.lastRequestEnded)).toLocaleString()
                 });
             } else if (timing.lastRequestStarted) {
                 details.push({
-                    label: ( localize(5695, "Last Activity")),
+                    label: ( localize(5764, "Last Activity")),
                     value: ( new Date(timing.lastRequestStarted)).toLocaleString()
                 });
             }
@@ -169,7 +169,7 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
             const section = append(this.content, $(".chat-debug-overview-section"));
             append(
                 section,
-                $("h3.chat-debug-overview-section-label", undefined, ( localize(5696, "Session Details")))
+                $("h3.chat-debug-overview-section-label", undefined, ( localize(5765, "Session Details")))
             );
             const detailsGrid = append(section, $(".chat-debug-overview-details"));
             for (const detail of details) {
@@ -182,13 +182,13 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
     getLocationLabel(location) {
         switch (location) {
         case ChatAgentLocation.Chat:
-            return localize(5697, "Chat Panel");
+            return localize(5766, "Chat Panel");
         case ChatAgentLocation.Terminal:
-            return localize(5698, "Terminal");
+            return localize(5767, "Terminal");
         case ChatAgentLocation.Notebook:
-            return localize(5699, "Notebook");
+            return localize(5768, "Notebook");
         case ChatAgentLocation.EditorInline:
-            return localize(5700, "Editor Inline");
+            return localize(5769, "Editor Inline");
         default:
             return String(location);
         }
@@ -197,7 +197,7 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
         const metricsSection = append(this.content, $(".chat-debug-overview-section"));
         append(
             metricsSection,
-            $("h3.chat-debug-overview-section-label", undefined, ( localize(5701, "Summary")))
+            $("h3.chat-debug-overview-section-label", undefined, ( localize(5770, "Summary")))
         );
         this.metricsContainer = append(metricsSection, $(".chat-debug-overview-metrics"));
         if (showShimmer) {
@@ -208,17 +208,17 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
         const actionsSection = append(this.content, $(".chat-debug-overview-section"));
         append(
             actionsSection,
-            $("h3.chat-debug-overview-section-label", undefined, ( localize(5702, "Explore Trace Data")))
+            $("h3.chat-debug-overview-section-label", undefined, ( localize(5771, "Explore Trace Data")))
         );
         const row = append(actionsSection, $(".chat-debug-overview-actions"));
         const viewLogsBtn = this.loadDisposables.add(( new Button(row, {
             ...defaultButtonStyles,
             secondary: true,
             supportIcons: true,
-            title: ( localize(5703, "View Logs"))
+            title: ( localize(5772, "View Logs"))
         })));
         viewLogsBtn.element.classList.add("chat-debug-overview-action-button");
-        viewLogsBtn.label = `$(list-flat) ${( localize(5703, "View Logs"))}`;
+        viewLogsBtn.label = `$(list-flat) ${( localize(5772, "View Logs"))}`;
         this.loadDisposables.add(viewLogsBtn.onDidClick(() => {
             this._onNavigate.fire(OverviewNavigation.Logs);
         }));
@@ -226,16 +226,16 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
             ...defaultButtonStyles,
             secondary: true,
             supportIcons: true,
-            title: ( localize(5704, "Agent Flow Chart"))
+            title: ( localize(5773, "Agent Flow Chart"))
         })));
         flowChartBtn.element.classList.add("chat-debug-overview-action-button");
-        flowChartBtn.label = `$(type-hierarchy) ${( localize(5704, "Agent Flow Chart"))}`;
+        flowChartBtn.label = `$(type-hierarchy) ${( localize(5773, "Agent Flow Chart"))}`;
         this.loadDisposables.add(flowChartBtn.onDidClick(() => {
             this._onNavigate.fire(OverviewNavigation.FlowChart);
         }));
     }
     renderMetricsShimmer(container) {
-        const placeholderLabels = [( localize(5705, "Model Turns")), ( localize(5706, "Tool Calls")), ( localize(5707, "Total Tokens")), ( localize(5708, "Errors")), ( localize(5709, "Total Events"))];
+        const placeholderLabels = [( localize(5774, "Model Turns")), ( localize(5775, "Tool Calls")), ( localize(5776, "Total Tokens")), ( localize(5777, "Errors")), ( localize(5778, "Total Events"))];
         for (const label of placeholderLabels) {
             const card = append(container, $(".chat-debug-overview-metric-card"));
             append(card, $("div.chat-debug-overview-metric-label", undefined, label));
@@ -252,19 +252,19 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
         );
         const totalTokens = modelTurns.reduce((sum, e) => sum + (e.totalTokens ?? 0), 0);
         const metrics = [{
-            label: ( localize(5705, "Model Turns")),
+            label: ( localize(5774, "Model Turns")),
             value: String(modelTurns.length)
         }, {
-            label: ( localize(5706, "Tool Calls")),
+            label: ( localize(5775, "Tool Calls")),
             value: String(toolCalls.length)
         }, {
-            label: ( localize(5707, "Total Tokens")),
+            label: ( localize(5776, "Total Tokens")),
             value: totalTokens.toLocaleString()
         }, {
-            label: ( localize(5708, "Errors")),
+            label: ( localize(5777, "Errors")),
             value: String(errors.length)
         }, {
-            label: ( localize(5709, "Total Events")),
+            label: ( localize(5778, "Total Events")),
             value: String(events.length)
         }];
         for (const metric of metrics) {

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

@@ -57,10 +57,10 @@ async function renderToolCallContent(content, languageService) {
     );
     const statusParts = [];
     if (content.result) {
-        statusParts.push(content.result === "success" ? ( localize(5710, "Success")) : ( localize(5711, "Error")));
+        statusParts.push(content.result === "success" ? ( localize(5779, "Success")) : ( localize(5780, "Error")));
     }
     if (content.durationInMillis !== undefined) {
-        statusParts.push(( localize(5712, "{0}ms", content.durationInMillis)));
+        statusParts.push(( localize(5781, "{0}ms", content.durationInMillis)));
     }
     if (statusParts.length > 0) {
         append(container, $(
@@ -74,13 +74,13 @@ async function renderToolCallContent(content, languageService) {
         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(5713, "Arguments")), plainText, tokenizedHtml, disposables);
+        renderSection(sectionsContainer, ( localize(5782, "Arguments")), plainText, tokenizedHtml, disposables);
     }
     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(5714, "Output")), plainText, tokenizedHtml, disposables);
+        renderSection(sectionsContainer, ( localize(5783, "Output")), plainText, tokenizedHtml, disposables);
     }
     return {
         element: container,
@@ -89,16 +89,16 @@ async function renderToolCallContent(content, languageService) {
 }
 function toolCallContentToPlainText(content) {
     const lines = [];
-    lines.push(( localize(5715, "Tool: {0}", content.toolName)));
+    lines.push(( localize(5784, "Tool: {0}", content.toolName)));
     if (content.result) {
-        lines.push(( localize(5716, "Status: {0}", content.result)));
+        lines.push(( localize(5785, "Status: {0}", content.result)));
     }
     if (content.durationInMillis !== undefined) {
-        lines.push(( localize(5717, "Duration: {0}ms", content.durationInMillis)));
+        lines.push(( localize(5786, "Duration: {0}ms", content.durationInMillis)));
     }
     if (content.input) {
         lines.push("");
-        lines.push(`[${( localize(5713, "Arguments"))}]`);
+        lines.push(`[${( localize(5782, "Arguments"))}]`);
         try {
             const parsed = JSON.parse(content.input);
             lines.push(JSON.stringify(parsed, null, 2));
@@ -108,7 +108,7 @@ function toolCallContentToPlainText(content) {
     }
     if (content.output) {
         lines.push("");
-        lines.push(`[${( localize(5714, "Output"))}]`);
+        lines.push(`[${( localize(5783, "Output"))}]`);
         try {
             const parsed = JSON.parse(content.output);
             lines.push(JSON.stringify(parsed, null, 2));

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

@@ -10,6 +10,8 @@ import { IEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 export interface IChatDebugEditorOptions extends IEditorOptions {
     readonly sessionResource?: URI;
     readonly viewHint?: "home" | "overview" | "logs" | "flowchart";
+    /** When set, automatically applies this text as the log filter. */
+    readonly filter?: string;
 }
 export declare enum ViewState {
     Home = "home",

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

@@ -283,6 +283,7 @@
 .chat-debug-editor-header .viewpane-filter-container {
 	flex: 1;
 	max-width: 500px;
+	margin-right: auto;
 }
 .chat-debug-editor-header .viewpane-filter-container .monaco-inputbox {
 	border-color: var(--vscode-panelInput-border, transparent) !important;
@@ -293,6 +294,12 @@
 	align-items: center;
 	gap: 6px;
 }
+.chat-debug-troubleshoot-button.monaco-button {
+	width: auto;
+	display: inline-flex;
+	align-items: center;
+	flex-shrink: 0;
+}
 .chat-debug-view-mode-labels {
 	display: grid;
 }

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

@@ -2,10 +2,8 @@ import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { IObservable, IReader, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { IEditSessionDiffStats, IEditSessionEntryDiff, IModifiedEntryTelemetryInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
@@ -40,8 +38,6 @@ export declare class ChatEditingCheckpointTimelineImpl implements IChatEditingCh
     private readonly _delegate;
     private readonly _notebookEditorModelResolverService;
     private readonly _notebookService;
-    private readonly _instantiationService;
-    private readonly _modelService;
     private readonly _textModelService;
     private readonly _editorWorkerService;
     private readonly _configurationService;
@@ -51,6 +47,7 @@ export declare class ChatEditingCheckpointTimelineImpl implements IChatEditingCh
     private readonly _operations;
     private readonly _fileBaselines;
     private readonly _refCountedDiffs;
+    private readonly _finalizedDiffCache;
     /** Gets the checkpoint, if any, we can 'undo' to. */
     private readonly _willUndoToCheckpoint;
     readonly canUndo: IObservable<boolean>;
@@ -61,7 +58,7 @@ export declare class ChatEditingCheckpointTimelineImpl implements IChatEditingCh
     private readonly _willRedoToEpoch;
     readonly canRedo: IObservable<boolean>;
     readonly requestDisablement: IObservable<IChatRequestDisablement[]>;
-    constructor(chatSessionResource: URI, _delegate: IChatEditingTimelineFsDelegate, _notebookEditorModelResolverService: INotebookEditorModelResolverService, _notebookService: INotebookService, _instantiationService: IInstantiationService, _modelService: IModelService, _textModelService: ITextModelService, _editorWorkerService: IEditorWorkerService, _configurationService: IConfigurationService);
+    constructor(chatSessionResource: URI, _delegate: IChatEditingTimelineFsDelegate, _notebookEditorModelResolverService: INotebookEditorModelResolverService, _notebookService: INotebookService, _textModelService: ITextModelService, _editorWorkerService: IEditorWorkerService, _configurationService: IConfigurationService);
     createCheckpoint(requestId: string | undefined, undoStopId: string | undefined, label: string, description?: string): string;
     undoToLastCheckpoint(): Promise<void>;
     redoToNextCheckpoint(): Promise<void>;

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

@@ -11,14 +11,13 @@ import { equals as equals$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
-import { TextModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { DefaultEndOfLine, ValidAnnotatedEditOperation, EndOfLinePreference } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
+import { createTextBuffer } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
 import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { CellUri, CellEditType } 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';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
@@ -30,9 +29,9 @@ import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
+import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
 import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/promise';
-import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 
 const START_REQUEST_EPOCH = "$$start";
 const STOP_ID_EPOCH_PREFIX = "__epoch_";
@@ -42,8 +41,6 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         _delegate,
         _notebookEditorModelResolverService,
         _notebookService,
-        _instantiationService,
-        _modelService,
         _textModelService,
         _editorWorkerService,
         _configurationService
@@ -52,8 +49,6 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         this._delegate = _delegate;
         this._notebookEditorModelResolverService = _notebookEditorModelResolverService;
         this._notebookService = _notebookService;
-        this._instantiationService = _instantiationService;
-        this._modelService = _modelService;
         this._textModelService = _textModelService;
         this._editorWorkerService = _editorWorkerService;
         this._configurationService = _configurationService;
@@ -65,6 +60,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         }, []);
         this._fileBaselines = ( new Map());
         this._refCountedDiffs = ( new Map());
+        this._finalizedDiffCache = ( new Map());
         this._willUndoToCheckpoint = derived(reader => {
             const currentEpoch = this._currentEpoch.read(reader);
             const checkpoints = this._checkpoints.read(reader);
@@ -99,7 +95,15 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                 return undefined;
             }
             const nextOperation = operations.find(op => op.epoch >= currentEpoch);
-            const nextCheckpoint = nextOperation && checkpoints.find(op => op.epoch > nextOperation.epoch);
+            if (!nextOperation) {
+                const nextRequestStart = checkpoints.find(cp => cp.epoch >= currentEpoch && cp.undoStopId === undefined);
+                if (!nextRequestStart) {
+                    return maxEncounteredEpoch + 1;
+                }
+                const requestAfter = checkpoints.find(cp => cp.epoch > nextRequestStart.epoch && cp.undoStopId === undefined);
+                return requestAfter ? requestAfter.epoch : (maxEncounteredEpoch + 1);
+            }
+            const nextCheckpoint = checkpoints.find(op => op.epoch > nextOperation.epoch);
             const currentCheckpoint = findLast(checkpoints, cp => cp.epoch < currentEpoch);
             if (currentCheckpoint && nextOperation && currentCheckpoint.requestId !== nextOperation.requestId) {
                 const startOfNextRequestIdx = findLastIdx(
@@ -571,31 +575,16 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         }
     }
     _applyTextEditsToContent(content, edits) {
-        const makeModel = (uri, contents) => this._instantiationService.createInstance(
-            TextModel,
-            contents,
-            "",
-            this._modelService.getCreationOptions("", uri, true),
-            uri
-        );
-        const tempUri = ( URI.from({
-            scheme: "temp",
-            path: `/temp-${Date.now()}.txt`
-        }));
-        const model = makeModel(tempUri, content);
+        const {
+            textBuffer,
+            disposable
+        } = createTextBuffer(content, DefaultEndOfLine.LF);
         try {
-            model.applyEdits(( edits.map(edit => ({
-                range: {
-                    startLineNumber: edit.range.startLineNumber,
-                    startColumn: edit.range.startColumn,
-                    endLineNumber: edit.range.endLineNumber,
-                    endColumn: edit.range.endColumn
-                },
-                text: edit.text
-            }))));
-            return model.getValue();
+            textBuffer.applyEdits(( edits.map(edit => ( new ValidAnnotatedEditOperation(null, Range.lift(edit.range), edit.text, false, false, false)))), false, false);
+            const fullRange = textBuffer.getRangeAt(0, textBuffer.getLength());
+            return textBuffer.getValueInRange(fullRange, EndOfLinePreference.TextDefined);
         } finally {
-            model.dispose();
+            disposable.dispose();
         }
     }
     getEntryDiffBetweenStops(uri, requestId, stopId) {
@@ -639,14 +628,18 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
     }
     _getEntryDiffBetweenEpochs(uri, cacheKey, epochs) {
         const key = `${( uri.toString())}\0${cacheKey}`;
+        const cached = this._finalizedDiffCache.get(key);
+        if (cached) {
+            return constObservable(cached);
+        }
         let obs = this._refCountedDiffs.get(key);
         if (!obs) {
-            obs = this._getEntryDiffBetweenEpochsInner(uri, epochs, () => this._refCountedDiffs.delete(key));
+            obs = this._getEntryDiffBetweenEpochsInner(uri, key, epochs, () => this._refCountedDiffs.delete(key));
             this._refCountedDiffs.set(key, obs);
         }
         return obs;
     }
-    _getEntryDiffBetweenEpochsInner(uri, epochs, onLastObserverRemoved) {
+    _getEntryDiffBetweenEpochsInner(uri, cacheKey, epochs, onLastObserverRemoved) {
         const modelRefsPromise = derived(this, reader => {
             const {
                 start,
@@ -744,6 +737,9 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             }
             const promised = result.promise?.promiseResult.read(reader);
             if (promised?.data) {
+                if (promised.data.isFinal) {
+                    this._finalizedDiffCache.set(cacheKey, promised.data);
+                }
                 return promised.data;
             }
             if (promised?.error) {
@@ -887,6 +883,6 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         });
     }
 };
-ChatEditingCheckpointTimelineImpl = ( __decorate([( __param(2, INotebookEditorModelResolverService)), ( __param(3, INotebookService)), ( __param(4, IInstantiationService)), ( __param(5, IModelService)), ( __param(6, ITextModelService)), ( __param(7, IEditorWorkerService)), ( __param(8, IConfigurationService))], ChatEditingCheckpointTimelineImpl));
+ChatEditingCheckpointTimelineImpl = ( __decorate([( __param(2, INotebookEditorModelResolverService)), ( __param(3, INotebookService)), ( __param(4, ITextModelService)), ( __param(5, IEditorWorkerService)), ( __param(6, IConfigurationService))], ChatEditingCheckpointTimelineImpl));
 
 export { ChatEditingCheckpointTimelineImpl };

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

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

@@ -8,7 +8,6 @@ import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/res
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { ChatMessageRole } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -130,7 +129,7 @@ let ChatEditingExplanationModelManager = class ChatEditingExplanationModelManage
                     this._updateUriStatePartial(fileData.uri, {
                         progress: "error",
                         explanations: [],
-                        errorMessage: ( localize(5789, "No language model available"))
+                        errorMessage: ( localize(5858, "No language model available"))
                     });
                 }
                 return;
@@ -163,7 +162,7 @@ Be specific about the actual code changes. Return ONLY valid JSON, no markdown.
 
 Example response format:
 [{"explanation": "Added null check to prevent crash"}, {"explanation": "Renamed variable for clarity"}]`;
-            const response = await this._languageModelsService.sendChatRequest(models[0], ( new ExtensionIdentifier("core")), [{
+            const response = await this._languageModelsService.sendChatRequest(models[0], undefined, [{
                 role: ChatMessageRole.User,
                 content: [{
                     type: "text",
@@ -201,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(5790, "Code was modified."));
+                    const parsedExplanation = parsed[parsedIndex]?.explanation?.trim() || ( localize(5859, "Code was modified."));
                     explanations.push({
                         uri: fileData.uri,
                         startLineNumber: data.startLineNumber,
@@ -219,7 +218,7 @@ Example response format:
             }
         } catch (e) {
             if (!cancellationToken.isCancellationRequested) {
-                const errorMessage = e instanceof Error ? e.message : ( localize(5791, "Failed to generate explanations"));
+                const errorMessage = e instanceof Error ? e.message : ( localize(5860, "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

@@ -141,7 +141,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(5804, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(5873, "Chat Edits")));
             } else {
                 resourceFilter.clear();
             }
@@ -183,7 +183,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(5805, "Chat Edit: '{0}'", request.message.text)) : ( localize(5806, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5874, "Chat Edit: '{0}'", request.message.text)) : ( localize(5875, "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.js

@@ -42,7 +42,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(5807, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(5876, "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.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(5808, "Chat Edit: '{0}'", request.message.text)) : ( localize(5809, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5877, "Chat Edit: '{0}'", request.message.text)) : ( localize(5878, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);

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(5810, "Saving chat edits history"))
+                label: ( localize(5879, "Saving chat edits history"))
             });
         }));
     }
@@ -346,7 +346,7 @@ class ChatDecorationsProvider extends Disposable {
     constructor(_sessions) {
         super();
         this._sessions = _sessions;
-        this.label = ( localize(5811, "Chat Editing"));
+        this.label = ( localize(5880, "Chat Editing"));
         this._currentEntries = derived(this, r => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -390,7 +390,7 @@ class ChatDecorationsProvider extends Disposable {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: ( localize(5812, "Pending changes from chat")),
+                tooltip: ( localize(5881, "Pending changes from chat")),
                 bubble: true
             };
         }

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

@@ -399,7 +399,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(5813, "Suggested Edits"))
+            label: ( localize(5882, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorService.openEditor(input, {
             pinned: true,

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

@@ -7,7 +7,7 @@
 	opacity: 0;
 	transition: opacity 0.2s ease-in-out;
 	display: flex;
-	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	box-shadow: var(--vscode-shadow-md);
 	border-radius: 6px;
 	overflow: hidden;
 }
@@ -21,7 +21,7 @@
 	border-radius: 6px;
 	background-color: var(--vscode-editorWidget-background);
 	color: var(--vscode-foreground);
-	border: 1px solid var(--vscode-contrastBorder);
+	border: 1px solid var(--vscode-editorWidget-border);
 	overflow: hidden;
 }
 

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(5814, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+            label: ( localize(5883, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }