@codingame/monaco-vscode-katex-common 26.2.1 → 27.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatHookContentPart.js

@@ -5,6 +5,7 @@ import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { HOOK_TYPES, HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
 import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
 import * as chatHookContentPart from './media/chatHookContentPart.css';
@@ -14,13 +15,13 @@ function getHookTypeLabel(hookType) {
     return HOOK_TYPES.find(hook => hook.id === hookType)?.label ?? hookType;
 }
 let ChatHookContentPart = class ChatHookContentPart extends ChatCollapsibleContentPart {
-    constructor(hookPart, context, hoverService) {
+    constructor(hookPart, context, hoverService, configurationService) {
         const hookTypeLabel = getHookTypeLabel(hookPart.hookType);
         const isStopped = !!hookPart.stopReason;
         const isWarning = !!hookPart.systemMessage;
         const toolName = hookPart.toolDisplayName;
-        const title = isStopped ? (toolName ? ( localize(5909, "Blocked {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(5910, "Blocked by {0} hook", hookTypeLabel))) : (toolName ? ( localize(5911, "Warning for {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(5912, "Warning from {0} hook", hookTypeLabel)));
-        super(title, context, undefined, hoverService);
+        const title = isStopped ? (toolName ? ( localize(6413, "Blocked {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(6414, "Blocked by {0} hook", hookTypeLabel))) : (toolName ? ( localize(6415, "Warning for {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(6416, "Warning from {0} hook", hookTypeLabel)));
+        super(title, context, undefined, hoverService, configurationService);
         this.hookPart = hookPart;
         this.icon = isStopped ? Codicon.error : isWarning ? Codicon.warning : Codicon.check;
         if (isStopped) {
@@ -50,6 +51,6 @@ let ChatHookContentPart = class ChatHookContentPart extends ChatCollapsibleConte
         return other.hookType === this.hookPart.hookType && other.stopReason === this.hookPart.stopReason && other.systemMessage === this.hookPart.systemMessage && other.toolDisplayName === this.hookPart.toolDisplayName;
     }
 };
-ChatHookContentPart = ( __decorate([( __param(2, IHoverService))], ChatHookContentPart));
+ChatHookContentPart = ( __decorate([( __param(2, IHoverService)), ( __param(3, IConfigurationService))], ChatHookContentPart));
 
 export { ChatHookContentPart };

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

@@ -39,7 +39,6 @@ export declare class InlineAnchorWidget extends Disposable {
     private readonly notebookDocumentService;
     private readonly openerService;
     static readonly className = "chat-inline-anchor-widget";
-    private readonly _chatResourceContext;
     readonly data: ContentRefData;
     constructor(element: HTMLAnchorElement | HTMLElement, inlineReference: IChatContentInlineReference, metadata: InlineAnchorWidgetMetadata | undefined, configurationService: IConfigurationService, originalContextKeyService: IContextKeyService, contextMenuService: IContextMenuService, fileService: IFileService, hoverService: IHoverService, instantiationService: IInstantiationService, labelService: ILabelService, languageService: ILanguageService, menuService: IMenuService, modelService: IModelService, telemetryService: ITelemetryService, themeService: IThemeService, notebookDocumentService: INotebookDocumentService, openerService: IOpenerService);
     getHTMLElement(): HTMLElement;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget.js

@@ -41,7 +41,7 @@ import { globMatchesResource } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { INotebookDocumentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService.service';
 import { ExplorerFolderContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/common/files';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { chatAttachmentResourceContextKey, hookUpSymbolAttachmentDragAndContextMenu } from '../../attachments/chatAttachmentWidgets.js';
+import { hookUpSymbolAttachmentDragAndContextMenu, chatAttachmentResourceContextKey } from '../../attachments/chatAttachmentWidgets.js';
 import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
@@ -133,13 +133,10 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
         } : {
             uri: inlineReference.inlineReference
         };
-        const contextKeyService = this._register(originalContextKeyService.createScoped(element));
-        this._chatResourceContext = chatAttachmentResourceContextKey.bindTo(contextKeyService);
         element.classList.add(InlineAnchorWidget_1.className, "show-file-icons");
         let iconText;
         let iconClasses;
         let location;
-        let updateContextKeys;
         if (this.data.kind === "symbol") {
             const symbol = this.data.symbol;
             location = this.data.symbol.location;
@@ -152,7 +149,7 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
                 SymbolKinds.toIcon(symbol.kind)
             )];
             this._store.add(instantiationService.invokeFunction(
-                accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, element, contextKeyService, {
+                accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, element, originalContextKeyService, {
                     value: symbol.location,
                     name: symbol.name,
                     kind: symbol.kind
@@ -186,23 +183,28 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
             this._register(themeService.onDidFileIconThemeChange(() => {
                 refreshIconClasses();
             }));
-            const isFolderContext = ExplorerFolderContext.bindTo(contextKeyService);
+            let isDirectory = false;
             fileService.stat(location.uri).then(stat => {
-                isFolderContext.set(stat.isDirectory);
+                isDirectory = stat.isDirectory;
                 if (stat.isDirectory) {
                     fileKind = FileKind.FOLDER;
                     refreshIconClasses();
                 }
             }).catch(() => {});
+            const contextKeyService = this._register(originalContextKeyService.createScoped(element));
+            chatAttachmentResourceContextKey.bindTo(contextKeyService).set(( location.uri.toString()));
+            const isFolderContext = ExplorerFolderContext.bindTo(contextKeyService);
+            let contextMenuInitialized = false;
             this._register(
                 addDisposableListener(element, EventType.CONTEXT_MENU, async domEvent => {
                     const event = ( new StandardMouseEvent(getWindow(domEvent), domEvent));
                     EventHelper.stop(domEvent, true);
-                    try {
-                        await updateContextKeys?.();
-                    } catch (e) {
-                        console.error(e);
+                    if (!contextMenuInitialized) {
+                        contextMenuInitialized = true;
+                        const resourceContextKey = ( new StaticResourceContextKey(contextKeyService, fileService, languageService, modelService));
+                        resourceContextKey.set(location.uri);
                     }
+                    isFolderContext.set(isDirectory);
                     if (this._store.isDisposed) {
                         return;
                     }
@@ -220,10 +222,10 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
             );
             if (location.range) {
                 if (location.range.startLineNumber === location.range.endLineNumber) {
-                    element.setAttribute("aria-label", ( localize(5913, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
+                    element.setAttribute("aria-label", ( localize(6417, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
                 } else {
                     element.setAttribute("aria-label", ( localize(
-                        5914,
+                        6418,
                         "{0} lines {1} to {2}",
                         filePathLabel,
                         location.range.startLineNumber,
@@ -232,9 +234,6 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
                 }
             }
         }
-        const resourceContextKey = ( new StaticResourceContextKey(contextKeyService, fileService, languageService, modelService));
-        resourceContextKey.set(location.uri);
-        this._chatResourceContext.set(( location.uri.toString()));
         const iconEl = $("span.icon");
         iconEl.classList.add(...iconClasses);
         element.replaceChildren(iconEl, $("span.icon-label", {}, ...iconText));
@@ -302,7 +301,7 @@ registerAction2(class AddFileToChatAction extends Action2 {
     constructor() {
         super({
             id: AddFileToChatAction.id,
-            title: ( localize2(5915, "Add File to Chat")),
+            title: ( localize2(6419, "Add File to Chat")),
             menu: [{
                 id: MenuId.ChatInlineResourceAnchorContext,
                 group: "chat",
@@ -326,7 +325,7 @@ registerAction2(class CopyResourceAction extends Action2 {
     constructor() {
         super({
             id: CopyResourceAction.id,
-            title: ( localize2(5916, "Copy")),
+            title: ( localize2(6420, "Copy")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -353,7 +352,7 @@ registerAction2(class OpenToSideResourceAction extends Action2 {
     constructor() {
         super({
             id: OpenToSideResourceAction.id,
-            title: ( localize2(5917, "Open to the Side")),
+            title: ( localize2(6421, "Open to the Side")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -419,8 +418,8 @@ registerAction2(class GoToDefinitionAction extends Action2 {
         super({
             id: GoToDefinitionAction.id,
             title: {
-                ...( localize2(5918, "Go to Definition")),
-                mnemonicTitle: ( localize(5919, "Go to &&Definition"))
+                ...( localize2(6422, "Go to Definition")),
+                mnemonicTitle: ( localize(6423, "Go to &&Definition"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -477,8 +476,8 @@ registerAction2(class GoToTypeDefinitionsAction extends Action2 {
         super({
             id: GoToTypeDefinitionsAction.id,
             title: {
-                ...( localize2(5920, "Go to Type Definitions")),
-                mnemonicTitle: ( localize(5921, "Go to &&Type Definitions"))
+                ...( localize2(6424, "Go to Type Definitions")),
+                mnemonicTitle: ( localize(6425, "Go to &&Type Definitions"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -503,8 +502,8 @@ registerAction2(class GoToImplementations extends Action2 {
         super({
             id: GoToImplementations.id,
             title: {
-                ...( localize2(5922, "Go to Implementations")),
-                mnemonicTitle: ( localize(5923, "Go to &&Implementations"))
+                ...( localize2(6426, "Go to Implementations")),
+                mnemonicTitle: ( localize(6427, "Go to &&Implementations"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -529,8 +528,8 @@ registerAction2(class GoToReferencesAction extends Action2 {
         super({
             id: GoToReferencesAction.id,
             title: {
-                ...( localize2(5924, "Go to References")),
-                mnemonicTitle: ( localize(5925, "Go to &&References"))
+                ...( localize2(6428, "Go to References")),
+                mnemonicTitle: ( localize(6429, "Go to &&References"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,

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

@@ -1,5 +1,6 @@
 import { type MarkdownRenderOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
@@ -45,6 +46,8 @@ export declare class ChatMarkdownContentPart extends Disposable implements IChat
     private static ID_POOL;
     readonly codeblocksPartId: string;
     readonly domNode: HTMLElement;
+    private readonly _onDidChangeHeight;
+    readonly onDidChangeHeight: Event<void>;
     private readonly allRefs;
     private readonly _codeblocks;
     get codeblocks(): IChatCodeBlockInfo[];

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownContentPart.js

@@ -1,7 +1,7 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $ as $$1, getWindow, isHTMLElement, addDisposableListener, EventType, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $ as $$1, clearNode, getWindow, DisposableResizeObserver, isHTMLElement, addDisposableListener, EventType, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { allowedMarkdownHtmlAttributes } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent';
 import { status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
@@ -12,7 +12,8 @@ import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arr
 import { findLast } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
-import { Disposable, toDisposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base/common/scrollable';
 import { equalsIgnoreCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
@@ -94,12 +95,13 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         this.instantiationService = instantiationService;
         this.aiEditTelemetryService = aiEditTelemetryService;
         this.codeblocksPartId = String(++ChatMarkdownContentPart_1.ID_POOL);
+        this._onDidChangeHeight = this._register(( new Emitter()));
+        this.onDidChangeHeight = this._onDidChangeHeight.event;
         this.allRefs = [];
         this._codeblocks = [];
         this.mathLayoutParticipants = ( new Set());
         const element = context.element;
         const inUndoStop = findLast(context.content, e => e.kind === "undoStop", context.contentIndex)?.id;
-        const orderedDisposablesList = [];
         let globalCodeBlockIndexStart = codeBlockStartIndex;
         let thisPartCodeBlockIndexStart = 0;
         this.domNode = $("div.chat-markdown-part");
@@ -110,10 +112,20 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
             }
         }
         const enableMath = configurationService.getValue(ChatConfiguration.EnableMath);
+        const renderStore = this._register(( new MutableDisposable()));
         const doRenderMarkdown = () => {
             if (this._store.isDisposed) {
                 return;
             }
+            const store = ( new DisposableStore());
+            renderStore.value = store;
+            clearNode(this.domNode);
+            this.allRefs.length = 0;
+            this._codeblocks.length = 0;
+            this.mathLayoutParticipants.clear();
+            globalCodeBlockIndexStart = codeBlockStartIndex;
+            thisPartCodeBlockIndexStart = 0;
+            const orderedDisposablesList = [];
             const markedExtensions = enableMath ? coalesce([MarkedKatexSupport.getExtension(getWindow(context.container), {
                 throwOnError: false
             })]) : [];
@@ -121,7 +133,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                 gfm: true,
                 breaks: true
             };
-            const result = this._register(renderer.render(markdown.content, {
+            const result = store.add(renderer.render(markdown.content, {
                 sanitizerConfig: MarkedKatexSupport.getSanitizerOptions({
                     allowedTags: allowedChatMarkdownHtmlTags,
                     allowedAttributes: allowedMarkdownHtmlAttributes
@@ -170,7 +182,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                         }
                     }
                     if (languageId === "vscode-extensions") {
-                        const chatExtensions = this._register(instantiationService.createInstance(ChatExtensionsContentPart, {
+                        const chatExtensions = store.add(instantiationService.createInstance(ChatExtensionsContentPart, {
                             kind: "extensions",
                             extensions: text.split(",")
                         }));
@@ -186,7 +198,13 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                         try {
                             const parsedBody = parseLocalFileData(text);
                             range = parsedBody.range && Range.lift(parsedBody.range);
-                            textModel = this.textModelService.createModelReference(parsedBody.uri).then(ref => ref.object.textEditorModel);
+                            const modelRefPromise = this.textModelService.createModelReference(parsedBody.uri);
+                            textModel = modelRefPromise.then(ref => {
+                                if (!store.isDisposed) {
+                                    store.add(ref);
+                                }
+                                return ref.object.textEditorModel;
+                            });
                         } catch (e) {
                             return $("div");
                         }
@@ -320,13 +338,12 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                 })));
             }
             const markdownDecorationsRenderer = instantiationService.createInstance(ChatMarkdownDecorationsRenderer);
-            this._register(
+            store.add(
                 markdownDecorationsRenderer.walkTreeAndAnnotateReferenceLinks(markdown, result.element)
             );
             const layoutParticipants = ( new Lazy(() => {
-                const observer = ( new ResizeObserver(() => this.mathLayoutParticipants.forEach(layout => layout())));
+                const observer = store.add(( new DisposableResizeObserver(() => this.mathLayoutParticipants.forEach(layout => layout()))));
                 observer.observe(this.domNode);
-                this._register(toDisposable(() => observer.disconnect()));
                 return this.mathLayoutParticipants;
             }));
             for (const katexBlock of this.domNode.querySelectorAll(".katex-display")) {
@@ -344,16 +361,15 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                 });
                 scrollable.scanDomNode();
             }
-            orderedDisposablesList.reverse().forEach(d => this._register(d));
+            orderedDisposablesList.reverse().forEach(d => store.add(d));
         };
+        doRenderMarkdown();
         if (enableMath && !MarkedKatexSupport.getExtension(getWindow(context.container))) {
-            MarkedKatexSupport.loadExtension(getWindow(context.container)).catch(e => {
-                console.error("Failed to load MarkedKatexSupport extension:", e);
-            }).finally(() => {
+            MarkedKatexSupport.loadExtension(getWindow(context.container)).then(() => {
                 doRenderMarkdown();
+            }).catch(e => {
+                console.error("Failed to load MarkedKatexSupport extension:", e);
             });
-        } else {
-            doRenderMarkdown();
         }
     }
     renderCodeBlockPill(sessionResource, requestId, inUndoStop, codemapperUri) {
@@ -377,7 +393,11 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         }).then(e => {
             this._codeblocks[data.codeBlockPartIndex].codemapperUri = e.codemapperUri;
         });
-        editorInfo.render(data, currentWidth);
+        editorInfo.render(data, currentWidth).then(() => {
+            if (!this._store.isDisposed && isRequestVM(data.element)) {
+                this._onDidChangeHeight.fire();
+            }
+        });
         return ref;
     }
     hasSameContent(other) {
@@ -467,6 +487,16 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
         this.pillElement.role = "button";
         this.element.appendChild(this.statusIndicatorContainer);
         this.element.appendChild(this.pillElement);
+        const updateCheckmarks = () => this.element.classList.toggle(
+            "show-checkmarks",
+            !!this.configurationService.getValue(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)
+        );
+        updateCheckmarks();
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
+                updateCheckmarks();
+            }
+        }));
         this.registerListeners();
     }
     registerListeners() {
@@ -560,7 +590,7 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 statusIconEl.classList.add(...statusIconClasses);
                 const entry = editSession.readEntry(uri, r);
                 const rwRatio = Math.floor((entry?.rewriteRatio.read(r) || 0) * 100);
-                statusLabelEl.textContent = ( localize(5926, "Applying edits"));
+                statusLabelEl.textContent = ( localize(6430, "Applying edits"));
                 const showAnimation = this.configurationService.getValue(ChatConfiguration.ShowCodeBlockProgressAnimation);
                 if (showAnimation) {
                     progressFill.style.width = `${rwRatio}%`;
@@ -569,13 +599,13 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 } else {
                     progressFill.style.width = "0%";
                     this.pillElement.classList.remove("progress-filling");
-                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(5927, "Generating edits...")) : ( localize(5928, "({0}%)...", rwRatio));
+                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(6431, "Generating edits...")) : ( localize(6432, "({0}%)...", rwRatio));
                 }
             } else {
                 const statusCodeicon = Codicon.check;
                 statusIconClasses = ThemeIcon.asClassNameArray(statusCodeicon);
                 statusIconEl.classList.add(...statusIconClasses);
-                statusLabelEl.textContent = ( localize(5929, "Edited"));
+                statusLabelEl.textContent = ( localize(6433, "Edited"));
                 const fileKind = uri.path.endsWith("/") ? FileKind.FOLDER : FileKind.FILE;
                 pillIconClasses = getIconClasses(this.modelService, this.languageService, uri, fileKind);
                 iconEl.classList.add(...pillIconClasses);
@@ -595,10 +625,10 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 this.currentDiff = changes;
                 labelAdded.textContent = `+${changes.added}`;
                 labelRemoved.textContent = `-${changes.removed}`;
-                const insertionsFragment = changes.added === 1 ? ( localize(5930, "1 insertion")) : ( localize(5931, "{0} insertions", changes.added));
-                const deletionsFragment = changes.removed === 1 ? ( localize(5932, "1 deletion")) : ( localize(5933, "{0} deletions", changes.removed));
+                const insertionsFragment = changes.added === 1 ? ( localize(6434, "1 insertion")) : ( localize(6435, "{0} insertions", changes.added));
+                const deletionsFragment = changes.removed === 1 ? ( localize(6436, "1 deletion")) : ( localize(6437, "{0} deletions", changes.removed));
                 const summary = ( localize(
-                    5934,
+                    6438,
                     "Edited {0}, {1}, {2}",
                     iconText,
                     insertionsFragment,

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMcpServersInteractionContentPart.js

@@ -96,19 +96,19 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
     }
     updateDetailedProgress(state) {
         const skipText = createMarkdownCommandLink({
-            title: ( localize(5935, "Skip?")),
+            title: ( localize(6439, "Skip?")),
             id: McpCommandIds.SkipCurrentAutostart
         });
         let content;
         if (state.starting.length === 0) {
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendText(( localize(5936, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
+            })).appendText(( localize(6440, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
         } else {
             const serverLinks = this.createServerCommandLinks(state.starting);
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendMarkdown(( localize(5937, "Starting MCP servers {0}...", serverLinks)) + " ").appendMarkdown(skipText);
+            })).appendMarkdown(( localize(6441, "Starting MCP servers {0}...", serverLinks)) + " ").appendMarkdown(skipText);
         }
         if (this.workingProgressPart) {
             this.workingProgressPart.updateMessage(content);
@@ -119,7 +119,8 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
             }, this._markdownRendererService, this.context, true,
             true,
             undefined,
-            undefined));
+            undefined,
+            false));
             this.domNode.appendChild(this.workingProgressPart.domNode);
         }
     }
@@ -146,12 +147,12 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
         const count = serversRequiringInteraction.length;
         const links = this.createServerCommandLinks(serversRequiringInteraction);
         const content = count === 1 ? ( localize(
-            5938,
+            6442,
             "The MCP server {0} may have new tools and requires interaction to start. [Start it now?]({1})",
             links,
             "#start"
         )) : ( localize(
-            5939,
+            6443,
             "The MCP servers {0} may have new tools and require interaction to start. [Start them now?]({1})",
             links,
             "#start"
@@ -193,7 +194,7 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
             const serversToStart = state.serversRequiringInteraction;
             for (let i = 0; i < serversToStart.length; i++) {
                 const serverInfo = serversToStart[i];
-                startLink.textContent = ( localize(5940, "Starting {0}...", serverInfo.label));
+                startLink.textContent = ( localize(6444, "Starting {0}...", serverInfo.label));
                 const server = this.mcpService.servers.get().find(s => s.definition.id === serverInfo.id);
                 if (server) {
                     await startServerAndWaitForLiveTools(server, {

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMultiDiffContentPart.js

@@ -64,7 +64,7 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
         const viewListButton = ( new ButtonWithIcon(viewListButtonContainer, {}));
         this._register(autorun(reader => {
             const fileCount = this.diffData.read(reader).resources.length;
-            viewListButton.label = fileCount === 1 ? ( localize(5941, "Changed 1 file")) : ( localize(5942, "Changed {0} files", fileCount));
+            viewListButton.label = fileCount === 1 ? ( localize(6445, "Changed 1 file")) : ( localize(6446, "Changed {0} files", fileCount));
         }));
         const setExpansionState = () => {
             viewListButton.icon = this.isCollapsed ? Codicon.chevronRight : Codicon.chevronDown;
@@ -86,7 +86,7 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
     renderViewAllFileChangesButton(container) {
         const button = container.appendChild($(".chat-view-changes-icon"));
         button.classList.add(...ThemeIcon.asClassNameArray(Codicon.diffMultiple));
-        button.title = ( localize(5943, "Open Changes"));
+        button.title = ( localize(6447, "Open Changes"));
         return addDisposableListener(button, "click", e => {
             const source = ( URI.parse(`multi-diff-editor:${( ( new Date()).getMilliseconds().toString()) + ( Math.random().toString())}`));
             const {
@@ -143,7 +143,7 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
                 alwaysConsumeMouseWheel: false,
                 accessibilityProvider: {
                     getAriaLabel: element => element.uri.path,
-                    getWidgetAriaLabel: () => ( localize(5944, "File Changes"))
+                    getWidgetAriaLabel: () => ( localize(6448, "File Changes"))
                 }
             })
         );
@@ -259,7 +259,7 @@ class ChatMultiDiffListRenderer {
             const removedElement = changesSummary.appendChild($(".deletions"));
             removedElement.textContent = `-${element.diff.removed}`;
             changesSummary.setAttribute("aria-label", ( localize(
-                5945,
+                6449,
                 "{0} lines added, {1} lines removed",
                 element.diff.added,
                 element.diff.removed

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

@@ -21,10 +21,11 @@ export declare class ChatProgressContentPart extends Disposable implements IChat
     private readonly showSpinner;
     private readonly isHidden;
     private readonly renderedMessage;
+    private readonly _fileWidgetStore;
     private currentContent;
     constructor(progress: IChatProgressMessage | IChatTask | IChatTaskSerialized | {
         content: IMarkdownString;
-    }, chatContentMarkdownRenderer: IMarkdownRenderer, context: IChatContentPartRenderContext, forceShowSpinner: boolean | undefined, forceShowMessage: boolean | undefined, icon: ThemeIcon | undefined, toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized | undefined, instantiationService: IInstantiationService, chatMarkdownAnchorService: IChatMarkdownAnchorService, configurationService: IConfigurationService);
+    }, chatContentMarkdownRenderer: IMarkdownRenderer, context: IChatContentPartRenderContext, forceShowSpinner: boolean | undefined, forceShowMessage: boolean | undefined, icon: ThemeIcon | undefined, toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized | undefined, shimmer: boolean | undefined, instantiationService: IInstantiationService, chatMarkdownAnchorService: IChatMarkdownAnchorService, configurationService: IConfigurationService);
     updateMessage(content: MarkdownString): void;
     hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
     private createApprovalMessage;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatProgressContentPart.js

@@ -4,7 +4,7 @@ import { $, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/d
 import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -28,6 +28,7 @@ let ChatProgressContentPart = class ChatProgressContentPart extends Disposable {
         forceShowMessage,
         icon,
         toolInvocation,
+        shimmer,
         instantiationService,
         chatMarkdownAnchorService,
         configurationService
@@ -39,6 +40,7 @@ let ChatProgressContentPart = class ChatProgressContentPart extends Disposable {
         this.chatMarkdownAnchorService = chatMarkdownAnchorService;
         this.configurationService = configurationService;
         this.renderedMessage = this._register(( new MutableDisposable()));
+        this._fileWidgetStore = this._register(( new DisposableStore()));
         this.currentContent = progress.content;
         const followingContent = context.content.slice(context.contentIndex + 1);
         this.showSpinner = forceShowSpinner ?? shouldShowSpinner(followingContent, context.element);
@@ -50,20 +52,25 @@ let ChatProgressContentPart = class ChatProgressContentPart extends Disposable {
         if (this.showSpinner && !this.configurationService.getValue(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
             alert(progress.content.value);
         }
-        const codicon = icon ? icon : this.showSpinner ? ThemeIcon.modify(Codicon.loading, "spin") : Codicon.check;
+        const isLoadingIcon = icon && ThemeIcon.isEqual(icon, ThemeIcon.modify(Codicon.loading, "spin"));
+        const useShimmer = (shimmer ?? (!icon || isLoadingIcon)) && this.showSpinner;
+        const codicon = useShimmer ? Codicon.check : (icon ?? (this.showSpinner ? ThemeIcon.modify(Codicon.loading, "spin") : Codicon.check));
         const result = this.chatContentMarkdownRenderer.render(progress.content);
         result.element.classList.add("progress-step");
         renderFileWidgets(
             result.element,
             this.instantiationService,
             this.chatMarkdownAnchorService,
-            this._store
+            this._fileWidgetStore
         );
         const tooltip = this.createApprovalMessage();
         const progressPart = this._register(
             instantiationService.createInstance(ChatProgressSubPart, result.element, codicon, tooltip)
         );
         this.domNode = progressPart.domNode;
+        if (useShimmer) {
+            this.domNode.classList.add("shimmer-progress");
+        }
         this.renderedMessage.value = result;
     }
     updateMessage(content) {
@@ -72,11 +79,12 @@ let ChatProgressContentPart = class ChatProgressContentPart extends Disposable {
         }
         const result = this._register(this.chatContentMarkdownRenderer.render(content));
         result.element.classList.add("progress-step");
+        this._fileWidgetStore.clear();
         renderFileWidgets(
             result.element,
             this.instantiationService,
             this.chatMarkdownAnchorService,
-            this._store
+            this._fileWidgetStore
         );
         if (this.renderedMessage.value) {
             this.renderedMessage.value.element.replaceWith(result.element);
@@ -99,7 +107,7 @@ let ChatProgressContentPart = class ChatProgressContentPart extends Disposable {
         return this.toolInvocation && getToolApprovalMessage(this.toolInvocation);
     }
 };
-ChatProgressContentPart = ( __decorate([( __param(7, IInstantiationService)), ( __param(8, IChatMarkdownAnchorService)), ( __param(9, IConfigurationService))], ChatProgressContentPart));
+ChatProgressContentPart = ( __decorate([( __param(8, IInstantiationService)), ( __param(9, IChatMarkdownAnchorService)), ( __param(10, IConfigurationService))], ChatProgressContentPart));
 function shouldShowSpinner(followingContent, element) {
     return isResponseVM(element) && !element.isComplete && followingContent.length === 0;
 }
@@ -114,6 +122,10 @@ let ChatProgressSubPart = class ChatProgressSubPart extends Disposable {
                 content: tooltip,
                 style: HoverStyle.Pointer
             }));
+            this._register(hoverService.setupDelayedHover(messageElement, {
+                content: tooltip,
+                style: HoverStyle.Pointer
+            }));
         }
         append(this.domNode, iconElement);
         messageElement.classList.add("progress-step");
@@ -133,7 +145,7 @@ let ChatWorkingProgressContentPart = class ChatWorkingProgressContentPart extend
     ) {
         const progressMessage = {
             kind: "progressMessage",
-            content: ( new MarkdownString()).appendText(( localize(5946, "Working...")))
+            content: ( new MarkdownString()).appendText(( localize(6450, "Working")))
         };
         super(
             progressMessage,
@@ -143,14 +155,14 @@ let ChatWorkingProgressContentPart = class ChatWorkingProgressContentPart extend
             undefined,
             undefined,
             undefined,
+            true,
             instantiationService,
             chatMarkdownAnchorService,
             configurationService
         );
-        this.domNode.classList.add("working-progress");
         this._register(languageModelToolsService.onDidPrepareToolCallBecomeUnresponsive(e => {
             if (isEqual(context.element.sessionResource, e.sessionResource)) {
-                this.updateMessage(( new MarkdownString(( localize(5947, "Waiting for tool '{0}' to respond...", e.toolData.displayName)))));
+                this.updateMessage(( new MarkdownString(( localize(6451, "Waiting for tool '{0}' to respond...", e.toolData.displayName)))));
             }
         }));
     }