@codingame/monaco-vscode-chat-service-override 23.2.2 → 24.1.0

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

@@ -1,24 +1,27 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
-import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IChatAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatResponseViewModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IChatElicitationRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
-import { ChatWidget } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
+import { IChatElicitationRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { ChatWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
 export declare class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
     private readonly _accessibilitySignalService;
     private readonly _instantiationService;
     private readonly _configurationService;
     private readonly _hostService;
+    private readonly _widgetService;
     readonly _serviceBrand: undefined;
     private _pendingSignalMap;
     private _requestId;
     private readonly notifications;
-    constructor(_accessibilitySignalService: IAccessibilitySignalService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService, _hostService: IHostService);
+    constructor(_accessibilitySignalService: IAccessibilitySignalService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService, _hostService: IHostService, _widgetService: IChatWidgetService);
     dispose(): void;
     acceptRequest(): number;
+    disposeRequest(requestId: number): void;
     acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
     acceptElicitation(elicitation: IChatElicitationRequest): void;
     private _showOSNotification;

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

@@ -1,32 +1,34 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { getWindow, triggerNotification } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { status, alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable, DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
-import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { AccessibilityProgressSignalScheduler } from '@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common/vscode/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
-import { showChatWidgetInViewOrEditor } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
-import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
-import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { AccessibilityProgressSignalScheduler } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { FocusMode } from '@codingame/monaco-vscode-api/vscode/vs/platform/native/common/native';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
-import { FocusMode } from '@codingame/monaco-vscode-2c64d2c2-fdf7-5675-a2fe-f6f65fbdedbf-common/vscode/vs/platform/native/common/native';
-import { getWindow, triggerNotification } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { ElicitationState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { AccessibilityVoiceSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService';
 
 const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 let ChatAccessibilityService = class ChatAccessibilityService extends Disposable {
-    constructor(_accessibilitySignalService, _instantiationService, _configurationService, _hostService) {
+    constructor(_accessibilitySignalService, _instantiationService, _configurationService, _hostService, _widgetService) {
         super();
         this._accessibilitySignalService = _accessibilitySignalService;
         this._instantiationService = _instantiationService;
         this._configurationService = _configurationService;
         this._hostService = _hostService;
+        this._widgetService = _widgetService;
         this._pendingSignalMap = this._register(( new DisposableMap()));
         this._requestId = 0;
         this.notifications = ( new Set());
@@ -44,6 +46,9 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         this._pendingSignalMap.set(this._requestId, this._instantiationService.createInstance(AccessibilityProgressSignalScheduler, CHAT_RESPONSE_PENDING_ALLOWANCE_MS, undefined));
         return this._requestId;
     }
+    disposeRequest(requestId) {
+        this._pendingSignalMap.deleteAndDispose(requestId);
+    }
     acceptResponse(widget, container, response, requestId, isVoiceInput) {
         this._pendingSignalMap.deleteAndDispose(requestId);
         const isPanelChat = typeof response !== 'string';
@@ -60,7 +65,7 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         }
     }
     acceptElicitation(elicitation) {
-        if (elicitation.state !== 'pending') {
+        if (elicitation.state.get() !== ElicitationState.Pending) {
             return;
         }
         const title = typeof elicitation.title === 'string' ? elicitation.title : elicitation.title.value;
@@ -87,9 +92,9 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
             ds.dispose();
             this.notifications.delete(ds);
         }
-        const title = widget?.viewModel?.model.title ? ( localize(4956, "Chat: {0}", widget.viewModel.model.title)) : ( localize(4957, "Untitled Chat"));
+        const title = widget?.viewModel?.model.title ? ( localize(5006, "Chat: {0}", widget.viewModel.model.title)) : ( localize(5007, "Untitled Chat"));
         const notification = await triggerNotification(title, {
-            detail: ( localize(4958, "New chat response."))
+            detail: ( localize(5008, "New chat response."))
         });
         if (!notification) {
             return;
@@ -99,7 +104,7 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         this.notifications.add(disposables);
         disposables.add(Event.once(notification.onClick)(async () => {
             await this._hostService.focus(targetWindow, { mode: FocusMode.Force });
-            await this._instantiationService.invokeFunction(showChatWidgetInViewOrEditor, widget);
+            await this._widgetService.reveal(widget);
             widget.focusInput();
             disposables.dispose();
             this.notifications.delete(disposables);
@@ -116,7 +121,8 @@ ChatAccessibilityService = ( __decorate([
     ( __param(0, IAccessibilitySignalService)),
     ( __param(1, IInstantiationService)),
     ( __param(2, IConfigurationService)),
-    ( __param(3, IHostService))
+    ( __param(3, IHostService)),
+    ( __param(4, IChatWidgetService))
 ], ChatAccessibilityService));
 
 export { ChatAccessibilityService };

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

@@ -8,7 +8,7 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { EditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
-import { SCMHistoryItemTransferData } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/scm/browser/scmHistoryChatContext";
+import { SCMHistoryItemTransferData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/scmHistoryChatContext";
 import { IChatRequestVariableEntry, OmittedState, IDiagnosticVariableEntry, ISymbolVariableEntry, ISCMHistoryItemVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
 import { IChatAttachmentResolveService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.service";
 export declare class ChatAttachmentResolveService implements IChatAttachmentResolveService {

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

@@ -13,14 +13,14 @@ import { isUntitledResourceEditorInput } from '@codingame/monaco-vscode-api/vsco
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { UntitledTextEditorInput } from '@codingame/monaco-vscode-7aa7b0aa-41af-57b3-860a-86d2f987a6c8-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST, createNotebookOutputVariableEntry } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils';
-import { getOutputViewModelFromId } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { getAttachableImageExtension, CHAT_ATTACHABLE_IMAGE_MIME_TYPES } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { UntitledTextEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
+import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST, createNotebookOutputVariableEntry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils';
+import { getOutputViewModelFromId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getAttachableImageExtension, CHAT_ATTACHABLE_IMAGE_MIME_TYPES } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { OmittedState, toPromptFileVariableEntry, PromptFileVariableKind, IDiagnosticVariableEntryFilterData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
-import { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
-import { resizeImage, imageToHash } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { resizeImage, imageToHash } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 
 let ChatAttachmentResolveService = class ChatAttachmentResolveService {
     constructor(fileService, editorService, textModelService, extensionService, dialogService) {
@@ -131,7 +131,7 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
             }
             const readFile = await this.fileService.readFile(resource);
             if (stat.size > 30 * 1024 * 1024) {
-                this.dialogService.error(( localize(4961, 'Image is too large')), ( localize(4962, 'The image {0} is too large to be attached.', fileName)));
+                this.dialogService.error(( localize(5011, 'Image is too large')), ( localize(5012, 'The image {0} is too large to be attached.', fileName)));
                 throw ( new Error('Image is too large'));
             }
             dataBuffer = readFile.value;

package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.d.ts

@@ -1,5 +1,5 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { InlineAnchorWidget } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget";
+import { InlineAnchorWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget";
 import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service";
 export declare class ChatMarkdownAnchorService extends Disposable implements IChatMarkdownAnchorService {
     readonly _serviceBrand: undefined;

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

@@ -1,7 +1,8 @@
 import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { LanguageSelector } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languageSelector";
 import { IChatContextPickService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service";
-import { IChatContextItem, IChatContextProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatContext";
+import { IChatContextItem, IChatContextProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContext";
+import { IChatRequestWorkspaceVariableEntry, StringChatContextValue } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
@@ -10,15 +11,21 @@ export declare class ChatContextService extends Disposable {
     private readonly _extensionService;
     _serviceBrand: undefined;
     private readonly _providers;
+    private readonly _workspaceContext;
     private readonly _registeredPickers;
+    private _lastResourceContext;
     constructor(_contextPickService: IChatContextPickService, _extensionService: IExtensionService);
     setChatContextProvider(id: string, picker: {
         title: string;
         icon: ThemeIcon;
     }): void;
     private _registerWithPickService;
-    registerChatContextProvider(id: string, selector: LanguageSelector, provider: IChatContextProvider): void;
+    registerChatContextProvider(id: string, selector: LanguageSelector | undefined, provider: IChatContextProvider): void;
     unregisterChatContextProvider(id: string): void;
-    contextForResource(uri: URI): Promise<IChatContextItem | undefined>;
+    updateWorkspaceContextItems(id: string, items: IChatContextItem[]): void;
+    getWorkspaceContextItems(): IChatRequestWorkspaceVariableEntry[];
+    contextForResource(uri: URI): Promise<StringChatContextValue | undefined>;
+    private _contextForResource;
+    resolveChatContext(context: StringChatContextValue): Promise<StringChatContextValue>;
     private _asPicker;
 }

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

@@ -15,7 +15,9 @@ let ChatContextService = class ChatContextService extends Disposable {
         this._contextPickService = _contextPickService;
         this._extensionService = _extensionService;
         this._providers = ( new Map());
+        this._workspaceContext = ( new Map());
         this._registeredPickers = this._register(( new DisposableMap()));
+        this._lastResourceContext = ( new Map());
     }
     setChatContextProvider(id, picker) {
         const providerEntry = this._providers.get(id) ?? { picker: undefined };
@@ -28,7 +30,8 @@ let ChatContextService = class ChatContextService extends Disposable {
         if (!providerEntry || !providerEntry.picker || !providerEntry.chatContextProvider) {
             return;
         }
-        this._registeredPickers.set(id, this._contextPickService.registerChatContextItem(this._asPicker(providerEntry.picker.title, providerEntry.picker.icon, id)));
+        const title = `${providerEntry.picker.title.replace(/\.+$/, '')}...`;
+        this._registeredPickers.set(id, this._contextPickService.registerChatContextItem(this._asPicker(title, providerEntry.picker.icon, id)));
     }
     registerChatContextProvider(id, selector, provider) {
         const providerEntry = this._providers.get(id) ?? { picker: undefined };
@@ -40,10 +43,34 @@ let ChatContextService = class ChatContextService extends Disposable {
         this._providers.delete(id);
         this._registeredPickers.deleteAndDispose(id);
     }
+    updateWorkspaceContextItems(id, items) {
+        this._workspaceContext.set(id, items);
+    }
+    getWorkspaceContextItems() {
+        const items = [];
+        for (const workspaceContexts of ( this._workspaceContext.values())) {
+            for (const item of workspaceContexts) {
+                if (!item.value) {
+                    continue;
+                }
+                items.push({
+                    value: item.value,
+                    name: item.label,
+                    modelDescription: item.modelDescription,
+                    id: item.label,
+                    kind: 'workspace'
+                });
+            }
+        }
+        return items;
+    }
     async contextForResource(uri) {
+        return this._contextForResource(uri, false);
+    }
+    async _contextForResource(uri, withValue) {
         const scoredProviders = [];
         for (const providerEntry of ( this._providers.values())) {
-            if (!providerEntry.chatContextProvider?.provider.provideChatContextForResource) {
+            if (!providerEntry.chatContextProvider?.provider.provideChatContextForResource || (providerEntry.chatContextProvider.selector === undefined)) {
                 continue;
             }
             const matchScore = score(providerEntry.chatContextProvider.selector, uri, '', true, undefined, undefined);
@@ -53,7 +80,40 @@ let ChatContextService = class ChatContextService extends Disposable {
         if (scoredProviders.length === 0 || scoredProviders[0].score <= 0) {
             return;
         }
-        const context = (await scoredProviders[0].provider.provideChatContextForResource(uri, {}, CancellationToken.None));
+        const context = (await scoredProviders[0].provider.provideChatContextForResource(uri, withValue, CancellationToken.None));
+        if (!context) {
+            return;
+        }
+        const contextValue = {
+            value: undefined,
+            name: context.label,
+            icon: context.icon,
+            uri: uri,
+            modelDescription: context.modelDescription
+        };
+        this._lastResourceContext.clear();
+        this._lastResourceContext.set(contextValue, { originalItem: context, provider: scoredProviders[0].provider });
+        return contextValue;
+    }
+    async resolveChatContext(context) {
+        if (context.value !== undefined) {
+            return context;
+        }
+        const item = this._lastResourceContext.get(context);
+        if (!item) {
+            const resolved = await this._contextForResource(context.uri, true);
+            context.value = resolved?.value;
+            context.modelDescription = resolved?.modelDescription;
+            return context;
+        }
+        else if (item.provider.resolveChatContext) {
+            const resolved = await item.provider.resolveChatContext(item.originalItem, CancellationToken.None);
+            if (resolved) {
+                context.value = resolved.value;
+                context.modelDescription = resolved.modelDescription;
+                return context;
+            }
+        }
         return context;
     }
     _asPicker(title, icon, id) {

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

@@ -1,9 +1,9 @@
 import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+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 { IEditSessionEntryDiff } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatRequestDisablement } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IEditSessionDiffStats, IEditSessionEntryDiff } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatRequestDisablement } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { FileOperation, IChatEditingTimelineState, IFileBaseline } from "./chatEditingOperations.js";
 /**
  * Interface for the new checkpoint-based timeline system
@@ -28,4 +28,8 @@ export interface IChatEditingCheckpointTimeline {
     restoreFromState(state: IChatEditingTimelineState, tx: ITransaction): void;
     getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined> | undefined;
     getEntryDiffBetweenRequests(uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined>;
+    getDiffsForFilesInRequest(requestId: string): IObservable<readonly IEditSessionEntryDiff[]>;
+    getDiffsForFilesInSession(): IObservable<readonly IEditSessionEntryDiff[]>;
+    getDiffForSession(): IObservable<IEditSessionDiffStats>;
+    hasEditsInRequest(requestId: string, reader?: IReader): boolean;
 }

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

@@ -1,5 +1,5 @@
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+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";
@@ -8,8 +8,8 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 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 { IEditSessionEntryDiff, IModifiedEntryTelemetryInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatRequestDisablement } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IEditSessionDiffStats, IEditSessionEntryDiff, IModifiedEntryTelemetryInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatRequestDisablement } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatEditingCheckpointTimeline } from "./chatEditingCheckpointTimeline.js";
 import { FileOperation, IChatEditingTimelineState, IFileBaseline } from "./chatEditingOperations.js";
 /**
@@ -36,7 +36,7 @@ export interface IChatEditingTimelineFsDelegate {
  *   operation is _not_ currently applied
  */
 export declare class ChatEditingCheckpointTimelineImpl implements IChatEditingCheckpointTimeline {
-    private readonly chatSessionId;
+    private readonly chatSessionResource;
     private readonly _delegate;
     private readonly _notebookEditorModelResolverService;
     private readonly _notebookService;
@@ -50,6 +50,7 @@ export declare class ChatEditingCheckpointTimelineImpl implements IChatEditingCh
     private readonly _currentEpoch;
     private readonly _operations;
     private readonly _fileBaselines;
+    private readonly _refCountedDiffs;
     /** Gets the checkpoint, if any, we can 'undo' to. */
     private readonly _willUndoToCheckpoint;
     readonly canUndo: IObservable<boolean>;
@@ -60,7 +61,7 @@ export declare class ChatEditingCheckpointTimelineImpl implements IChatEditingCh
     private readonly _willRedoToEpoch;
     readonly canRedo: IObservable<boolean>;
     readonly requestDisablement: IObservable<IChatRequestDisablement[]>;
-    constructor(chatSessionId: string, _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, _instantiationService: IInstantiationService, _modelService: IModelService, _textModelService: ITextModelService, _editorWorkerService: IEditorWorkerService, _configurationService: IConfigurationService);
     createCheckpoint(requestId: string | undefined, undoStopId: string | undefined, label: string, description?: string): string;
     undoToLastCheckpoint(): Promise<void>;
     redoToNextCheckpoint(): Promise<void>;
@@ -96,7 +97,15 @@ export declare class ChatEditingCheckpointTimelineImpl implements IChatEditingCh
     private _applyFileSystemOperation;
     private _applyTextEditsToContent;
     getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined>;
+    /** Gets the epoch bounds of the request. If stopRequestId is undefined, gets ONLY the single request's bounds */
+    private _getRequestEpochBounds;
     getEntryDiffBetweenRequests(uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined>;
     private _getEntryDiffBetweenEpochs;
+    private _getEntryDiffBetweenEpochsInner;
     private _computeDiff;
+    hasEditsInRequest(requestId: string, reader?: IReader): boolean;
+    getDiffsForFilesInRequest(requestId: string): IObservable<readonly IEditSessionEntryDiff[]>;
+    private _getDiffsForFilesAtEpochs;
+    getDiffsForFilesInSession(): IObservable<readonly IEditSessionEntryDiff[]>;
+    getDiffForSession(): IObservable<IEditSessionDiffStats>;
 }