@codingame/monaco-vscode-katex-common 24.3.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/{chatAgentHover.js → widget/chatAgentHover.js}

@@ -10,8 +10,8 @@ import { FileAccess } from '@codingame/monaco-vscode-api/vscode/vs/base/common/n
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { getFullyQualifiedId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { IChatAgentService, IChatAgentNameService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { getFullyQualifiedId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents';
+import { IChatAgentService, IChatAgentNameService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { showExtensionsWithIdsCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { verifiedPublisherIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionsIcons';
@@ -49,7 +49,7 @@ let ChatAgentHover = class ChatAgentHover extends Disposable {
         this.publisherName = $('span.chat-agent-hover-publisher-name');
         append(hoverElement.publisher, verifiedBadge, this.publisherName);
         hoverElement.warning.appendChild(renderIcon(Codicon.warning));
-        hoverElement.warning.appendChild($('span', undefined, ( localize(5009, "This chat extension is using a reserved name."))));
+        hoverElement.warning.appendChild($('span', undefined, ( localize(5607, "This chat extension is using a reserved name."))));
     }
     setAgent(id) {
         const agent = this.chatAgentService.getAgent(id);
@@ -99,7 +99,7 @@ function getChatAgentHoverOptions(getAgent, commandService) {
         actions: [
             {
                 commandId: showExtensionsWithIdsCommandId,
-                label: ( localize(5010, "View Extension")),
+                label: ( localize(5608, "View Extension")),
                 run: () => {
                     const agent = getAgent();
                     if (agent) {

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatAgentCommandContentPart.d.ts

@@ -1,9 +1,9 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
-import { IChatAgentCommand } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatAgentCommand } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
+import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
+import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export declare class ChatAgentCommandContentPart extends Disposable implements IChatContentPart {
     private readonly _hoverService;
     readonly domNode: HTMLElement;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatAgentCommandContentPart.js

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
-import { chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
@@ -26,7 +26,7 @@ let ChatAgentCommandContentPart = class ChatAgentCommandContentPart extends Disp
             content: cmd.description,
             style: HoverStyle.Pointer,
         }, { groupId }));
-        const rerun = ( localize(5042, "Rerun without {0}{1}", chatSubcommandLeader, cmd.name));
+        const rerun = ( localize(5609, "Rerun without {0}{1}", chatSubcommandLeader, cmd.name));
         const btn = ( new Button(this.domNode, { ariaLabel: rerun }));
         btn.icon = Codicon.close;
         this._store.add(btn.onDidClick(() => onClick()));

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatAnonymousRateLimitedPart.d.ts

@@ -2,8 +2,8 @@ import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
-import { IChatErrorDetailsPart, IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
-import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
+import { IChatErrorDetailsPart, IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
+import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export declare class ChatAnonymousRateLimitedPart extends Disposable implements IChatContentPart {
     private readonly content;
     readonly domNode: HTMLElement;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatAnonymousRateLimitedPart.js

@@ -21,11 +21,11 @@ let ChatAnonymousRateLimitedPart = class ChatAnonymousRateLimitedPart extends Di
         const messageContainer = append(this.domNode, $('.chat-rate-limited-message'));
         const message = append(messageContainer, $('div'));
         message.textContent = ( localize(
-            5043,
+            5610,
             "Continue the conversation by signing in. Your free account gets 50 premium requests a month plus access to more models and AI features."
         ));
         const signInButton = this._register(( new Button(messageContainer, { ...defaultButtonStyles, supportIcons: true })));
-        signInButton.label = ( localize(5044, "Enable more AI features"));
+        signInButton.label = ( localize(5611, "Enable more AI features"));
         signInButton.element.classList.add('chat-rate-limited-button');
         this._register(signInButton.onDidClick(async () => {
             const commandId = 'workbench.action.chat.triggerSetup';

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatAttachmentsContentPart.d.ts

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
-import { IChatContentReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
+import { IChatContentReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 export interface IChatAttachmentsContentPartOptions {
     readonly variables: IChatRequestVariableEntry[];
     readonly contentReferences?: ReadonlyArray<IChatContentReference>;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatAttachmentsContentPart.js

@@ -8,9 +8,9 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ResourceLabels } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
-import { isElementVariableEntry, isImageVariableEntry, OmittedState, isPromptFileVariableEntry, isPromptTextVariableEntry, isTerminalVariableEntry, isPasteVariableEntry, isNotebookOutputVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isWorkspaceVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
-import { ChatResponseReferencePartStatusKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { ToolSetOrToolItemAttachmentWidget, ElementChatAttachmentWidget, ImageAttachmentWidget, PromptFileAttachmentWidget, PromptTextAttachmentWidget, FileAttachmentWidget, TerminalCommandAttachmentWidget, PasteAttachmentWidget, NotebookCellOutputChatAttachmentWidget, SCMHistoryItemAttachmentWidget, SCMHistoryItemChangeAttachmentWidget, SCMHistoryItemChangeRangeAttachmentWidget, DefaultChatAttachmentWidget } from '../chatAttachmentWidgets.js';
+import { isElementVariableEntry, isImageVariableEntry, OmittedState, isPromptFileVariableEntry, isPromptTextVariableEntry, isTerminalVariableEntry, isPasteVariableEntry, isNotebookOutputVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isWorkspaceVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { ChatResponseReferencePartStatusKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { ToolSetOrToolItemAttachmentWidget, ElementChatAttachmentWidget, ImageAttachmentWidget, PromptFileAttachmentWidget, PromptTextAttachmentWidget, FileAttachmentWidget, TerminalCommandAttachmentWidget, PasteAttachmentWidget, NotebookCellOutputChatAttachmentWidget, SCMHistoryItemAttachmentWidget, SCMHistoryItemChangeAttachmentWidget, SCMHistoryItemChangeRangeAttachmentWidget, DefaultChatAttachmentWidget } from '../../attachments/chatAttachmentWidgets.js';
 
 let ChatAttachmentsContentPart = class ChatAttachmentsContentPart extends Disposable {
     constructor(options, instantiationService) {

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatChangesSummaryPart.d.ts

@@ -1,16 +1,17 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
-import { IChatChangesSummaryPart as IChatFileChangesSummaryPart, IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
-import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IChatEditingSession, IEditSessionEntryDiff } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
-import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+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 { IChatEditingSession, IEditSessionEntryDiff } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IChatChangesSummaryPart as IChatFileChangesSummaryPart, IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
+import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export declare class ChatCheckpointFileChangesSummaryContentPart extends Disposable implements IChatContentPart {
+    private readonly content;
     private readonly hoverService;
     private readonly chatService;
     private readonly editorService;
@@ -22,19 +23,15 @@ export declare class ChatCheckpointFileChangesSummaryContentPart extends Disposa
     private readonly _onDidChangeHeight;
     readonly onDidChangeHeight: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     private readonly diffsBetweenRequests;
-    private fileChanges;
     private fileChangesDiffsObservable;
     private list;
     private isCollapsed;
     constructor(content: IChatFileChangesSummaryPart, context: IChatContentPartRenderContext, hoverService: IHoverService, chatService: IChatService, editorService: IEditorService, editorGroupsService: IEditorGroupsService, instantiationService: IInstantiationService);
-    private changeID;
     private computeFileChangesDiffs;
     getCachedEntryDiffBetweenRequests(editSession: IChatEditingSession, uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined> | undefined;
     private renderHeader;
     private renderViewAllFileChangesButton;
     private renderFilesList;
-    private updateList;
-    private computeFileChangeSummaryItems;
     hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
     addDisposable(disposable: IDisposable): void;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatChangesSummaryPart.js

@@ -1,34 +1,35 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { $, addDisposableListener, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { WorkbenchList } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { ButtonWithIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
+import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import { ResourcePool } from './chatCollections.js';
-import { ResourceLabels } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
-import { createFileIconThemableTreeContainerScope } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/browser/views/explorerView';
+import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { WorkbenchList } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { ResourceLabels } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
+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 { createFileIconThemableTreeContainerScope } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/browser/views/explorerView';
 import { MultiDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { MultiDiffEditorItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
-import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
-import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
-import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ResourcePool } from './chatCollections.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let ChatCheckpointFileChangesSummaryContentPart = class ChatCheckpointFileChangesSummaryContentPart extends Disposable {
     constructor(content, context, hoverService, chatService, editorService, editorGroupsService, instantiationService) {
         super();
+        this.content = content;
         this.hoverService = hoverService;
         this.chatService = chatService;
         this.editorService = editorService;
@@ -40,36 +41,20 @@ let ChatCheckpointFileChangesSummaryContentPart = class ChatCheckpointFileChange
         this.onDidChangeHeight = this._onDidChangeHeight.event;
         this.diffsBetweenRequests = ( new Map());
         this.isCollapsed = true;
-        this.fileChanges = content.fileChanges;
-        this.fileChangesDiffsObservable = this.computeFileChangesDiffs(context, content.fileChanges);
+        this.fileChangesDiffsObservable = this.computeFileChangesDiffs(content);
         const headerDomNode = $('.checkpoint-file-changes-summary-header');
         this.domNode = $('.checkpoint-file-changes-summary', undefined, headerDomNode);
         this.domNode.tabIndex = 0;
         this._register(this.renderHeader(headerDomNode));
         this._register(this.renderFilesList(this.domNode));
     }
-    changeID(change) {
-        return `${change.sessionId}-${change.requestId}-${change.reference.path}`;
-    }
-    computeFileChangesDiffs(context, changes) {
-        return derived((r) => {
-            const fileChangesDiffs = ( new Map());
-            const firstRequestId = changes[0].requestId;
-            const lastRequestId = changes[changes.length - 1].requestId;
-            for (const change of changes) {
-                const sessionId = change.sessionId;
-                const session = this.chatService.getSession(LocalChatSessionUri.forSession(sessionId));
-                if (!session || !session.editingSession) {
-                    continue;
-                }
-                const diff = this.getCachedEntryDiffBetweenRequests(session.editingSession, change.reference, firstRequestId, lastRequestId)?.read(r);
-                if (!diff) {
-                    continue;
-                }
-                fileChangesDiffs.set(this.changeID(change), diff);
-            }
-            return fileChangesDiffs;
-        });
+    computeFileChangesDiffs({ requestId, sessionResource }) {
+        return ( ( ( this.chatService.chatModels
+            .map(
+            models => Iterable.find(models, m => isEqual(m.sessionResource, sessionResource))
+        ))
+            .map(model => model?.editingSession?.getDiffsForFilesInRequest(requestId)))
+            .map((diffs, r) => diffs?.read(r) || Iterable.empty()));
     }
     getCachedEntryDiffBetweenRequests(editSession, uri, startRequestId, stopRequestId) {
         const key = `${uri}\0${startRequestId}\0${stopRequestId}`;
@@ -83,7 +68,10 @@ let ChatCheckpointFileChangesSummaryContentPart = class ChatCheckpointFileChange
     renderHeader(container) {
         const viewListButtonContainer = container.appendChild($('.chat-file-changes-label'));
         const viewListButton = ( new ButtonWithIcon(viewListButtonContainer, {}));
-        viewListButton.label = this.fileChanges.length === 1 ? `Changed 1 file` : `Changed ${this.fileChanges.length} files`;
+        this._register(autorun(r => {
+            const diffs = this.fileChangesDiffsObservable.read(r);
+            viewListButton.label = diffs.length === 1 ? `Changed 1 file` : `Changed ${diffs.length} files`;
+        }));
         const setExpansionState = () => {
             viewListButton.icon = this.isCollapsed ? Codicon.chevronRight : Codicon.chevronDown;
             this.domNode.classList.toggle('chat-file-changes-collapsed', this.isCollapsed);
@@ -102,27 +90,16 @@ let ChatCheckpointFileChangesSummaryContentPart = class ChatCheckpointFileChange
     renderViewAllFileChangesButton(container) {
         const button = container.appendChild($('.chat-view-changes-icon'));
         this.hoverService.setupDelayedHover(button, () => ({
-            content: ( localize2(5045, 'View All File Changes'))
+            content: ( localize2(5612, 'View All File Changes'))
         }));
         button.classList.add(...ThemeIcon.asClassNameArray(Codicon.diffMultiple));
         button.setAttribute('role', 'button');
         button.tabIndex = 0;
         return addDisposableListener(button, 'click', (e) => {
-            const resources = [];
-            for (const fileChange of this.fileChanges) {
-                const diffEntry = this.fileChangesDiffsObservable.get().get(this.changeID(fileChange));
-                if (diffEntry) {
-                    resources.push({
-                        originalUri: diffEntry.originalURI,
-                        modifiedUri: diffEntry.modifiedURI
-                    });
-                }
-                else {
-                    resources.push({
-                        originalUri: fileChange.reference
-                    });
-                }
-            }
+            const resources = ( this.fileChangesDiffsObservable.get().map(diff => ({
+                originalUri: diff.originalURI,
+                modifiedUri: diff.modifiedURI
+            })));
             const source = ( URI.parse(`multi-diff-editor:${( ( new Date()).getMilliseconds().toString()) + ( Math.random().toString())}`));
             const input = this.instantiationService.createInstance(MultiDiffEditorInput, source, 'Checkpoint File Changes', ( resources.map(resource => {
                 return ( new MultiDiffEditorItem(resource.originalUri, resource.modifiedUri, undefined));
@@ -135,71 +112,34 @@ let ChatCheckpointFileChangesSummaryContentPart = class ChatCheckpointFileChange
         const store = ( new DisposableStore());
         this.list = store.add(this.instantiationService.createInstance(CollapsibleChangesSummaryListPool)).get();
         const listNode = this.list.getHTMLElement();
-        const itemsShown = Math.min(this.fileChanges.length, this.MAX_ITEMS_SHOWN);
-        const height = itemsShown * this.ELEMENT_HEIGHT;
-        this.list.layout(height);
-        listNode.style.height = height + 'px';
-        this.updateList(this.fileChanges, this.fileChangesDiffsObservable.get());
         container.appendChild(listNode.parentElement);
         store.add(this.list.onDidOpen((item) => {
-            const element = item.element;
-            if (!element) {
+            const diff = item.element;
+            if (!diff) {
                 return;
             }
-            const diff = this.fileChangesDiffsObservable.get().get(this.changeID(element));
-            if (diff) {
-                const input = {
-                    original: { resource: diff.originalURI },
-                    modified: { resource: diff.modifiedURI },
-                    options: { preserveFocus: true }
-                };
-                this.editorService.openEditor(input);
-            }
-            else {
-                this.editorService.openEditor({ resource: element.reference, options: { preserveFocus: true } });
-            }
+            const input = {
+                original: { resource: diff.originalURI },
+                modified: { resource: diff.modifiedURI },
+                options: { preserveFocus: true }
+            };
+            this.editorService.openEditor(input);
         }));
         store.add(this.list.onContextMenu(e => {
             EventHelper.stop(e.browserEvent, true);
         }));
         store.add(autorun((r) => {
-            this.updateList(this.fileChanges, this.fileChangesDiffsObservable.read(r));
+            const diffs = this.fileChangesDiffsObservable.read(r);
+            const itemsShown = Math.min(diffs.length, this.MAX_ITEMS_SHOWN);
+            const height = itemsShown * this.ELEMENT_HEIGHT;
+            this.list.layout(height);
+            listNode.style.height = height + 'px';
+            this.list.splice(0, this.list.length, diffs);
         }));
         return store;
     }
-    updateList(fileChanges, fileChangesDiffs) {
-        this.list.splice(0, this.list.length, this.computeFileChangeSummaryItems(fileChanges, fileChangesDiffs));
-    }
-    computeFileChangeSummaryItems(fileChanges, fileChangesDiffs) {
-        const items = [];
-        for (const fileChange of fileChanges) {
-            const diffEntry = fileChangesDiffs.get(this.changeID(fileChange));
-            if (diffEntry) {
-                const additionalLabels = [];
-                if (diffEntry) {
-                    additionalLabels.push({
-                        description: ` +${diffEntry.added} `,
-                        className: 'insertions',
-                    });
-                    additionalLabels.push({
-                        description: ` -${diffEntry.removed} `,
-                        className: 'deletions',
-                    });
-                }
-                const item = {
-                    ...fileChange,
-                    additionalLabels
-                };
-                items.push(item);
-            }
-            else {
-                items.push(fileChange);
-            }
-        }
-        return items;
-    }
     hasSameContent(other, followingContent, element) {
-        return other.kind === 'changesSummary' && other.fileChanges.length === this.fileChanges.length;
+        return other.kind === 'changesSummary' && other.requestId === this.content.requestId;
     }
     addDisposable(disposable) {
         this._register(disposable);
@@ -263,19 +203,19 @@ class CollapsibleChangesSummaryListRenderer {
     }
     renderElement(data, index, templateData) {
         const label = templateData.label;
-        label.setFile(data.reference, {
+        label.setFile(data.modifiedURI, {
             fileKind: FileKind.FILE,
-            title: data.reference.path
+            title: data.modifiedURI.path
         });
         const labelElement = label.element;
-        labelElement.querySelector(`.${CollapsibleChangesSummaryListRenderer.CHANGES_SUMMARY_CLASS_NAME}`)?.remove();
-        if (!data.additionalLabels) {
-            return;
-        }
-        const changesSummary = labelElement.appendChild($(`.${CollapsibleChangesSummaryListRenderer.CHANGES_SUMMARY_CLASS_NAME}`));
-        for (const additionalLabel of data.additionalLabels) {
-            const element = changesSummary.appendChild($(`.${additionalLabel.className}`));
-            element.textContent = additionalLabel.description;
+        templateData.changesElement?.remove();
+        if (!data.identical && !data.isBusy) {
+            const changesSummary = labelElement.appendChild($(`.${CollapsibleChangesSummaryListRenderer.CHANGES_SUMMARY_CLASS_NAME}`));
+            const added = changesSummary.appendChild($(`.insertions`));
+            added.textContent = `+${data.added}`;
+            const removed = changesSummary.appendChild($(`.deletions`));
+            removed.textContent = `-${data.removed}`;
+            templateData.changesElement = changesSummary;
         }
     }
     disposeTemplate(templateData) {

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatCodeCitationContentPart.d.ts

@@ -1,8 +1,8 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
-import { IChatCodeCitations, IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatCodeCitations, IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 export declare class ChatCodeCitationContentPart extends Disposable implements IChatContentPart {
     private readonly editorService;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatCodeCitationContentPart.js

@@ -5,7 +5,7 @@ import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/b
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { getCodeCitationsMessage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { getCodeCitationsMessage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 let ChatCodeCitationContentPart = class ChatCodeCitationContentPart extends Disposable {
@@ -29,7 +29,7 @@ let ChatCodeCitationContentPart = class ChatCodeCitationContentPart extends Disp
             buttonSecondaryHoverBackground: undefined,
             buttonSeparator: undefined
         })));
-        button.label = ( localize(5046, "View matches"));
+        button.label = ( localize(5613, "View matches"));
         this._register(button.onDidClick(() => {
             const citationText = `# Code Citations\n\n` + ( citations.citations.map(c => `## License: ${c.license}\n${( c.value.toString())}\n\n\`\`\`\n${c.snippet}\n\`\`\`\n\n`)).join('\n');
             this.editorService.openEditor({ resource: undefined, contents: citationText, languageId: 'markdown' });

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatCollapsibleContentPart.d.ts

@@ -3,15 +3,19 @@ import { Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { IMarkdownString, MarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
-import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
-import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service";
+import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
+import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 export declare abstract class ChatCollapsibleContentPart extends Disposable implements IChatContentPart {
     private title;
     protected readonly context: IChatContentPartRenderContext;
+    private readonly hoverMessage;
+    private readonly hoverService;
     private _domNode?;
     private readonly _renderedTitleWithWidgets;
     protected readonly _onDidChangeHeight: Emitter<void>;
@@ -19,7 +23,10 @@ export declare abstract class ChatCollapsibleContentPart extends Disposable impl
     protected readonly hasFollowingContent: boolean;
     protected _isExpanded: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<boolean, void>;
     protected _collapseButton: ButtonWithIcon | undefined;
-    constructor(title: IMarkdownString | string, context: IChatContentPartRenderContext);
+    private readonly _overrideIcon;
+    get icon(): ThemeIcon | undefined;
+    set icon(value: ThemeIcon | undefined);
+    constructor(title: IMarkdownString | string, context: IChatContentPartRenderContext, hoverMessage: IMarkdownString | undefined, hoverService: IHoverService);
     get domNode(): HTMLElement;
     protected init(): HTMLElement;
     protected abstract initContent(): HTMLElement;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatCollapsibleContentPart.js

@@ -1,24 +1,35 @@
 
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { ButtonWithIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
+import { HoverStyle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { renderFileWidgets } from '../chatInlineAnchorWidget.js';
+import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { renderFileWidgets } from './chatInlineAnchorWidget.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
-class ChatCollapsibleContentPart extends Disposable {
-    constructor(title, context) {
+let ChatCollapsibleContentPart = class ChatCollapsibleContentPart extends Disposable {
+    get icon() {
+        return this._overrideIcon.get();
+    }
+    set icon(value) {
+        this._overrideIcon.set(value, undefined);
+    }
+    constructor(title, context, hoverMessage, hoverService) {
         super();
         this.title = title;
         this.context = context;
+        this.hoverMessage = hoverMessage;
+        this.hoverService = hoverService;
         this._renderedTitleWithWidgets = this._register(( new MutableDisposable()));
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
         this._isExpanded = observableValue(this, false);
+        this._overrideIcon = observableValue(this, undefined);
         this.hasFollowingContent = this.context.contentIndex + 1 < this.context.content.length;
     }
     get domNode() {
@@ -41,15 +52,21 @@ class ChatCollapsibleContentPart extends Disposable {
         this._collapseButton = collapseButton;
         this._domNode = $('.chat-used-context', undefined, buttonElement);
         collapseButton.label = referencesLabel;
+        if (this.hoverMessage) {
+            this._register(this.hoverService.setupDelayedHover(collapseButton.iconElement, {
+                content: this.hoverMessage,
+                style: HoverStyle.Pointer,
+            }));
+        }
         this._register(collapseButton.onDidClick(() => {
             const value = this._isExpanded.get();
             this._isExpanded.set(!value, undefined);
         }));
         this._register(autorun(r => {
-            const value = this._isExpanded.read(r);
-            collapseButton.icon = value ? Codicon.chevronDown : Codicon.chevronRight;
-            this._domNode?.classList.toggle('chat-used-context-collapsed', !value);
-            this.updateAriaLabel(collapseButton.element, typeof referencesLabel === 'string' ? referencesLabel : referencesLabel.value, this.isExpanded());
+            const expanded = this._isExpanded.read(r);
+            collapseButton.icon = this._overrideIcon.read(r) ?? (expanded ? Codicon.chevronDown : Codicon.chevronRight);
+            this._domNode?.classList.toggle('chat-used-context-collapsed', !expanded);
+            this.updateAriaLabel(collapseButton.element, typeof referencesLabel === 'string' ? referencesLabel : referencesLabel.value, expanded);
             if (this._domNode?.isConnected) {
                 queueMicrotask(() => {
                     this._onDidChangeHeight.fire();
@@ -61,7 +78,8 @@ class ChatCollapsibleContentPart extends Disposable {
         return this._domNode;
     }
     updateAriaLabel(element, label, expanded) {
-        element.ariaLabel = expanded ? ( localize(5047, "{0}, expanded", label)) : ( localize(5048, "{0}, collapsed", label));
+        element.ariaLabel = label;
+        element.ariaExpanded = String(expanded);
     }
     addDisposable(disposable) {
         this._register(disposable);
@@ -96,6 +114,9 @@ class ChatCollapsibleContentPart extends Disposable {
         this.updateAriaLabel(this._collapseButton.element, textContent, this.isExpanded());
         this._renderedTitleWithWidgets.value = result;
     }
-}
+};
+ChatCollapsibleContentPart = ( __decorate([
+    ( __param(3, IHoverService))
+], ChatCollapsibleContentPart));
 
 export { ChatCollapsibleContentPart };

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatCommandContentPart.d.ts

@@ -1,8 +1,8 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
-import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatCommandButton } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatCommandButton } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 export declare class ChatCommandButtonContentPart extends Disposable implements IChatContentPart {
     private readonly commandService;
     readonly domNode: HTMLElement;