@codingame/monaco-vscode-katex-common 26.2.2 → 28.0.0

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";
@@ -21,7 +22,7 @@ import { CodeBlockModelCollection } from "../../../common/widget/codeBlockModelC
 import { IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { ICodeBlockRenderOptions } from "./codeBlockPart.js";
 import { EditorPool } from "./chatContentCodePools.js";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
 export interface IChatMarkdownContentPartOptions {
     readonly codeBlockRenderOptions?: ICodeBlockRenderOptions;
     readonly allowInlineDiffs?: boolean;
@@ -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,18 +1,20 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $ as $$1, getWindow, DisposableResizeObserver, 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';
 import { HoverStyle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover';
 import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
+import { wrapTablesWithScrollable } from './chatMarkdownTableScrolling.js';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 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, 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 +96,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 +113,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 +134,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 +183,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 +199,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,11 +339,11 @@ 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 = this._register(( new DisposableResizeObserver(() => this.mathLayoutParticipants.forEach(layout => layout()))));
+                const observer = store.add(( new DisposableResizeObserver(() => this.mathLayoutParticipants.forEach(layout => layout()))));
                 observer.observe(this.domNode);
                 return this.mathLayoutParticipants;
             }));
@@ -343,16 +362,16 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                 });
                 scrollable.scanDomNode();
             }
-            orderedDisposablesList.reverse().forEach(d => this._register(d));
+            orderedDisposablesList.push(wrapTablesWithScrollable(this.domNode, layoutParticipants));
+            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) {
@@ -376,7 +395,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) {
@@ -466,6 +489,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() {
@@ -559,7 +592,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(6520, "Applying edits"));
                 const showAnimation = this.configurationService.getValue(ChatConfiguration.ShowCodeBlockProgressAnimation);
                 if (showAnimation) {
                     progressFill.style.width = `${rwRatio}%`;
@@ -568,13 +601,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(6521, "Generating edits...")) : ( localize(6522, "({0}%)...", rwRatio));
                 }
             } else {
                 const statusCodeicon = Codicon.check;
                 statusIconClasses = ThemeIcon.asClassNameArray(statusCodeicon);
                 statusIconEl.classList.add(...statusIconClasses);
-                statusLabelEl.textContent = ( localize(5929, "Edited"));
+                statusLabelEl.textContent = ( localize(6523, "Edited"));
                 const fileKind = uri.path.endsWith("/") ? FileKind.FOLDER : FileKind.FILE;
                 pillIconClasses = getIconClasses(this.modelService, this.languageService, uri, fileKind);
                 iconEl.classList.add(...pillIconClasses);
@@ -594,10 +627,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(6524, "1 insertion")) : ( localize(6525, "{0} insertions", changes.added));
+                const deletionsFragment = changes.removed === 1 ? ( localize(6526, "1 deletion")) : ( localize(6527, "{0} deletions", changes.removed));
                 const summary = ( localize(
-                    5934,
+                    6528,
                     "Edited {0}, {1}, {2}",
                     iconText,
                     insertionsFragment,

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

@@ -0,0 +1,15 @@
+import { Lazy } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lazy";
+import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+/**
+ * Finds all tables in `domNode` and wraps each in a {@link DomScrollableElement}
+ * so they scroll horizontally with the custom VS Code scrollbar instead of the
+ * native one. Each wrapped table is pushed onto `orderedDisposablesList` and a
+ * `scanDomNode` callback is registered on `layoutParticipants` so the scrollbar
+ * re-measures whenever the container is resized.
+ *
+ * Each column's `min-width` is also set to the maximum character count across
+ * all cells in that column (in `ch` units), preventing short-content columns
+ * like "001" from being squeezed to one character wide. Single-character columns
+ * are left unchanged. This is layout-free: only `textContent` lengths are read.
+ */
+export declare function wrapTablesWithScrollable(domNode: HTMLElement, layoutParticipants: Lazy<Set<() => void>>): DisposableStore;

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

@@ -0,0 +1,55 @@
+
+import { isHTMLElement, createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base/common/scrollable';
+
+function wrapTablesWithScrollable(domNode, layoutParticipants) {
+    const store = ( new DisposableStore());
+    for (const table of domNode.querySelectorAll("table")) {
+        if (!isHTMLElement(table)) {
+            continue;
+        }
+        applyTableColumnMinWidths(table);
+        const parent = table.parentElement;
+        const nextSibling = table.nextSibling;
+        const tableContainer = createElement("div");
+        tableContainer.appendChild(table);
+        const scrollable = store.add(( new DomScrollableElement(tableContainer, {
+            vertical: ScrollbarVisibility.Hidden,
+            horizontal: ScrollbarVisibility.Auto
+        })));
+        const scrollNode = scrollable.getDomNode();
+        scrollNode.classList.add("rendered-markdown-table-scroll-wrapper");
+        parent?.insertBefore(scrollNode, nextSibling);
+        layoutParticipants.value.add(() => {
+            scrollable.scanDomNode();
+        });
+        scrollable.scanDomNode();
+    }
+    return store;
+}
+const TABLE_COLUMN_MIN_WIDTH_CAP_CH = 3;
+function applyTableColumnMinWidths(table) {
+    const rows = table.rows;
+    const colMaxChars = [];
+    for (const row of rows) {
+        for (let c = 0; c < row.cells.length; c++) {
+            const len = row.cells[c].textContent?.length ?? 0;
+            if (len > (colMaxChars[c] ?? 0)) {
+                colMaxChars[c] = len;
+            }
+        }
+    }
+    const firstRow = rows[0];
+    if (firstRow) {
+        for (let c = 0; c < firstRow.cells.length; c++) {
+            const minCh = colMaxChars[c];
+            if (minCh !== undefined && minCh > 1) {
+                firstRow.cells[c].style.minWidth = Math.min(minCh, TABLE_COLUMN_MIN_WIDTH_CAP_CH) + "ch";
+            }
+        }
+    }
+}
+
+export { wrapTablesWithScrollable };

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

@@ -5,7 +5,7 @@ import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
 import { IChatMcpServersStarting, IChatMcpServersStartingSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
 export declare class ChatMcpServersInteractionContentPart extends Disposable implements IChatContentPart {
     private readonly data;
     private readonly context;

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(6529, "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(6530, "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(6531, "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,
+            6532,
             "The MCP server {0} may have new tools and requires interaction to start. [Start it now?]({1})",
             links,
             "#start"
         )) : ( localize(
-            5939,
+            6533,
             "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(6534, "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.d.ts

@@ -6,7 +6,7 @@ import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IChatMultiDiffData, IChatMultiDiffDataSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 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/widget/chatContentParts/chatContentParts";
+import { IChatContentPart } from "./chatContentParts.js";
 export declare class ChatMultiDiffContentPart extends Disposable implements IChatContentPart {
     private readonly content;
     private readonly _element;

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(6535, "Changed 1 file")) : ( localize(6536, "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(6537, "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(6538, "File Changes"))
                 }
             })
         );
@@ -259,7 +259,7 @@ class ChatMultiDiffListRenderer {
             const removedElement = changesSummary.appendChild($(".deletions"));
             removedElement.textContent = `-${element.diff.removed}`;
             changesSummary.setAttribute("aria-label", ( localize(
-                5945,
+                6539,
                 "{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

@@ -6,7 +6,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IChatProgressMessage, IChatTask, IChatTaskSerialized, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 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/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.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 { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
@@ -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

@@ -1,10 +1,12 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { $, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 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 { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
+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 +30,7 @@ let ChatProgressContentPart = class ChatProgressContentPart extends Disposable {
         forceShowMessage,
         icon,
         toolInvocation,
+        shimmer,
         instantiationService,
         chatMarkdownAnchorService,
         configurationService
@@ -39,6 +42,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);
@@ -47,23 +51,28 @@ let ChatProgressContentPart = class ChatProgressContentPart extends Disposable {
             this.domNode = $("");
             return;
         }
-        if (this.showSpinner && !this.configurationService.getValue(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
-            alert(progress.content.value);
+        if (this.showSpinner && this.configurationService.getValue(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
+            alert(stripIcons(renderAsPlaintext(progress.content)));
         }
-        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 +81,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 +109,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 +124,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 +147,7 @@ let ChatWorkingProgressContentPart = class ChatWorkingProgressContentPart extend
     ) {
         const progressMessage = {
             kind: "progressMessage",
-            content: ( new MarkdownString()).appendText(( localize(5946, "Working...")))
+            content: ( new MarkdownString()).appendText(( localize(6540, "Working")))
         };
         super(
             progressMessage,
@@ -143,14 +157,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(6541, "Waiting for tool '{0}' to respond...", e.toolData.displayName)))));
             }
         }));
     }

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

@@ -2,13 +2,13 @@ import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IChatPullRequestContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 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/widget/chatContentParts/chatContentParts";
-import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
+import { IChatContentPart } from "./chatContentParts.js";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 export declare class ChatPullRequestContentPart extends Disposable implements IChatContentPart {
     private readonly pullRequestContent;
-    private readonly openerService;
+    private readonly commandService;
     readonly domNode: HTMLElement;
-    constructor(pullRequestContent: IChatPullRequestContent, openerService: IOpenerService);
+    constructor(pullRequestContent: IChatPullRequestContent, commandService: ICommandService);
     hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
     addDisposable(disposable: IDisposable): void;
 }

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

@@ -6,14 +6,14 @@ import { $, append, addDisposableListener } from '@codingame/monaco-vscode-api/v
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 
 registerCss(chatPullRequestContent);
 let ChatPullRequestContentPart = class ChatPullRequestContentPart extends Disposable {
-    constructor(pullRequestContent, openerService) {
+    constructor(pullRequestContent, commandService) {
         super();
         this.pullRequestContent = pullRequestContent;
-        this.openerService = openerService;
+        this.commandService = commandService;
         this.domNode = $(".chat-pull-request-content-part");
         const container = append(this.domNode, $(".container"));
         const contentContainer = append(container, $(".content-container"));
@@ -22,11 +22,16 @@ let ChatPullRequestContentPart = class ChatPullRequestContentPart extends Dispos
         icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitPullRequest));
         const titleLink = append(titleContainer, $("a.title"));
         titleLink.textContent = `${this.pullRequestContent.title} - ${this.pullRequestContent.author}`;
-        titleLink.href = ( this.pullRequestContent.uri.toString());
+        if (this.pullRequestContent.uri) {
+            titleLink.href = this.pullRequestContent.uri?.toString();
+        }
         this._register(addDisposableListener(titleLink, "click", e => {
             e.preventDefault();
             e.stopPropagation();
-            this.openerService.open(this.pullRequestContent.uri);
+            this.commandService.executeCommand(
+                this.pullRequestContent.command.id,
+                ...(this.pullRequestContent.command.arguments ?? [])
+            );
         }));
     }
     hasSameContent(other, followingContent, element) {
@@ -36,6 +41,6 @@ let ChatPullRequestContentPart = class ChatPullRequestContentPart extends Dispos
         this._register(disposable);
     }
 };
-ChatPullRequestContentPart = ( __decorate([( __param(1, IOpenerService))], ChatPullRequestContentPart));
+ChatPullRequestContentPart = ( __decorate([( __param(1, ICommandService))], ChatPullRequestContentPart));
 
 export { ChatPullRequestContentPart };