@codingame/monaco-vscode-katex-common 33.0.7 → 34.0.0

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

@@ -2,6 +2,7 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { h, addDisposableListener, EventType, DisposableResizeObserver, clearNode, getActiveWindow, getComputedStyle, createTextNode, createElement, $, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { createPixelSpinner } from '../../../../../../../base/browser/ui/pixelSpinner/pixelSpinner.js';
 import { MarkdownString, isMarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -94,11 +95,13 @@ let TerminalCommandDecoration = class TerminalCommandDecoration extends Disposab
         super();
         this._options = _options;
         this._hoverService = _hoverService;
+        this._hoverRegistered = false;
         const decorationElements = h("span.chat-terminal-command-decoration@decoration", {
             role: "img",
             tabIndex: 0
         });
         this._element = decorationElements.decoration;
+        createPixelSpinner(this._element);
         this._attachElementToContainer();
     }
     _attachElementToContainer() {
@@ -115,10 +118,12 @@ let TerminalCommandDecoration = class TerminalCommandDecoration extends Disposab
                 container.insertBefore(decoration, container.firstElementChild ?? null);
             }
         }
-        this._register(this._hoverService.setupDelayedHover(decoration, () => ({
-            content: this._getHoverText()
-        })));
-        this._attachInteractionHandlers(decoration);
+        if (!this._hoverRegistered) {
+            this._hoverRegistered = true;
+            this._register(this._hoverService.setupDelayedHover(decoration, () => ({
+                content: this._getHoverText()
+            })));
+        }
     }
     _getHoverText() {
         const command = this._options.getResolvedCommand();
@@ -153,12 +158,18 @@ let TerminalCommandDecoration = class TerminalCommandDecoration extends Disposab
         }
         const decorationState = getTerminalCommandDecorationState(command, storedState);
         const tooltip = getTerminalCommandDecorationTooltip(command, storedState);
+        const isRunning = this._options.getIsRunning();
         decoration.className = `chat-terminal-command-decoration ${DecorationSelector.CommandDecoration}`;
-        decoration.classList.add(DecorationSelector.Codicon);
-        for (const className of decorationState.classNames) {
-            decoration.classList.add(className);
+        if (isRunning) {
+            const nonIconClasses = decorationState.classNames.filter(c => c !== DecorationSelector.Codicon && !c.startsWith("codicon-"));
+            decoration.classList.add("chat-terminal-running-spinner", ...nonIconClasses);
+        } else {
+            decoration.classList.add(
+                DecorationSelector.Codicon,
+                ...decorationState.classNames,
+                ...ThemeIcon.asClassNameArray(decorationState.icon)
+            );
         }
-        decoration.classList.add(...ThemeIcon.asClassNameArray(decorationState.icon));
         const isInteractive = !decoration.classList.contains(DecorationSelector.Default);
         decoration.tabIndex = isInteractive ? 0 : -1;
         if (isInteractive) {
@@ -173,12 +184,6 @@ let TerminalCommandDecoration = class TerminalCommandDecoration extends Disposab
             decoration.removeAttribute("aria-label");
         }
     }
-    _attachInteractionHandlers(decoration) {
-        if (this._interactionElement === decoration) {
-            return;
-        }
-        this._interactionElement = decoration;
-    }
 };
 TerminalCommandDecoration = ( __decorate([( __param(1, IHoverService))], TerminalCommandDecoration));
 let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart {
@@ -247,7 +252,8 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             terminalData: this._terminalData,
             getCommandBlock: () => elements.commandBlock,
             getIconElement: () => undefined,
-            getResolvedCommand: () => this._getResolvedCommand()
+            getResolvedCommand: () => this._getResolvedCommand(),
+            getIsRunning: () => this._isInvocationRunning()
         }));
         const displayCommand = terminalData.presentationOverrides?.commandLine ?? command;
         const displayLanguage = terminalData.presentationOverrides?.language ?? terminalData.language;
@@ -327,7 +333,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const markdownOptions = {
             codeBlockRenderOptions,
             accessibilityOptions: pastTenseMessage ? {
-                statusMessage: ( localize(7416, "{0}", stripIcons(pastTenseMessage)))
+                statusMessage: ( localize(7555, "{0}", stripIcons(pastTenseMessage)))
             } : undefined
         };
         this.markdownPart = this._register(_instantiationService.createInstance(
@@ -349,7 +355,14 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             this.getIcon(),
             terminalData.autoApproveInfo
         ));
+        progressPart.domNode.classList.add("chat-terminal-progress-row");
         this._decoration.update();
+        if (toolInvocation.kind === "toolInvocation") {
+            this._register(autorun(reader => {
+                toolInvocation.state.read(reader);
+                this._decoration.update();
+            }));
+        }
         const terminalToolsInThinking = this._configurationService.getValue(ChatConfiguration.TerminalToolsInThinking);
         const isSimpleTerminal = this._configurationService.getValue(ChatConfiguration.SimpleTerminalCollapsible);
         const requiresConfirmation = toolInvocation.kind === "toolInvocation" && IChatToolInvocation.getConfirmationMessages(toolInvocation);
@@ -538,12 +551,12 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         this._actionBarActions.clear();
         const actions = [];
         if (this._toolbarCanContinueInBackground) {
-            const action = ( new Action(TerminalContribCommandId.ContinueInBackground, ( localize(7417, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true, () => this.continueInBackground()));
+            const action = ( new Action(TerminalContribCommandId.ContinueInBackground, ( localize(7556, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true, () => this.continueInBackground()));
             this._actionBarActions.add(action);
             actions.push(action);
         }
         if (this._toolbarHasInstance) {
-            const focusLabel = this._toolbarIsHiddenTerminal ? ( localize(7418, "Show and Focus Terminal")) : ( localize(7419, "Focus Terminal"));
+            const focusLabel = this._toolbarIsHiddenTerminal ? ( localize(7557, "Show and Focus Terminal")) : ( localize(7558, "Focus Terminal"));
             const action = ( new Action(
                 TerminalContribCommandId.FocusChatInstanceAction,
                 focusLabel,
@@ -556,7 +569,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         }
         if (this._toolbarHasOutput && !this._usesCollapsibleWrapper) {
             const toggleIcon = this._toolbarOutputExpanded ? Codicon.chevronDown : Codicon.chevronRight;
-            const toggleLabel = this._toolbarOutputExpanded ? ( localize(7420, "Hide Output")) : ( localize(7421, "Show Output"));
+            const toggleLabel = this._toolbarOutputExpanded ? ( localize(7559, "Hide Output")) : ( localize(7560, "Show Output"));
             const action = ( new Action(
                 TerminalContribCommandId.ToggleChatTerminalOutput,
                 toggleLabel,
@@ -579,6 +592,20 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         }
         return this._resolveCommand(target);
     }
+    _isInvocationRunning() {
+        const commandExitCode = this._getResolvedCommand()?.exitCode;
+        if (commandExitCode !== undefined) {
+            return false;
+        }
+        const storedExitCode = this._terminalData.terminalCommandState?.exitCode;
+        if (storedExitCode !== undefined) {
+            return false;
+        }
+        if (!IChatToolInvocation.isComplete(this.toolInvocation)) {
+            return true;
+        }
+        return this._terminalData.isBackground === true || this._terminalData.didContinueInBackground === true;
+    }
     _clearCommandAssociation(options) {
         this._terminalCommandUri = undefined;
         if (options?.clearPersistentData) {
@@ -989,7 +1016,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return;
         }
-        const ariaLabel = ( localize(7422, "Terminal output for {0}", commandText));
+        const ariaLabel = ( localize(7561, "Terminal output for {0}", commandText));
         const scrollableDomNode = this._scrollableContainer.getDomNode();
         scrollableDomNode.setAttribute("role", "region");
         const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.TerminalChatOutput);
@@ -1002,26 +1029,26 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return undefined;
         }
-        const commandHeader = ( localize(7423, "Command: {0}", commandText));
+        const commandHeader = ( localize(7562, "Command: {0}", commandText));
         if (command) {
             const rawOutput = command.getOutput();
             if (!rawOutput || rawOutput.trim().length === 0) {
-                return `${commandHeader}\n${( localize(7424, "No output was produced by the command."))}`;
+                return `${commandHeader}\n${( localize(7563, "No output was produced by the command."))}`;
             }
             const lines = rawOutput.split("\n");
             return `${commandHeader}\n${lines.join("\n").trimEnd()}`;
         }
         const snapshot = this._getTerminalCommandOutput();
         if (!snapshot) {
-            return `${commandHeader}\n${( localize(7425, "Command output is no longer available."))}`;
+            return `${commandHeader}\n${( localize(7564, "Command output is no longer available."))}`;
         }
         const plain = removeAnsiEscapeCodes((snapshot.text ?? ""));
         if (!plain.trim().length) {
-            return `${commandHeader}\n${( localize(7424, "No output was produced by the command."))}`;
+            return `${commandHeader}\n${( localize(7563, "No output was produced by the command."))}`;
         }
         let outputText = plain.trimEnd();
         if (snapshot.truncated) {
-            outputText += `\n${( localize(7426, "Output truncated."))}`;
+            outputText += `\n${( localize(7565, "Output truncated."))}`;
         }
         return `${commandHeader}\n${outputText}`;
     }
@@ -1133,7 +1160,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         }
         if (!hasOutput) {
             if (commandFinished) {
-                this._showEmptyMessage(( localize(7424, "No output was produced by the command.")));
+                this._showEmptyMessage(( localize(7563, "No output was produced by the command.")));
             }
         } else {
             this._hideEmptyMessage();
@@ -1160,7 +1187,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (hasText) {
             this._hideEmptyMessage();
         } else {
-            this._showEmptyMessage(( localize(7424, "No output was produced by the command.")));
+            this._showEmptyMessage(( localize(7563, "No output was produced by the command.")));
         }
         const lineCount = result?.lineCount ?? snapshot.lineCount ?? 0;
         this._layoutOutput(lineCount);
@@ -1169,9 +1196,9 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         clearNode(this._terminalContainer);
         this._lastRenderedLineCount = undefined;
         if (!liveTerminalInstance) {
-            this._showEmptyMessage(( localize(7427, "Terminal is no longer available.")));
+            this._showEmptyMessage(( localize(7566, "Terminal is no longer available.")));
         } else {
-            this._showEmptyMessage(( localize(7428, "Command information is not available.")));
+            this._showEmptyMessage(( localize(7567, "Command information is not available.")));
         }
     }
     async _resolveLiveTerminal() {
@@ -1298,7 +1325,7 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         hoverService,
         configurationService
     ) {
-        const title = isSkipped ? ( localize(7429, "Skipped {0}", commandText)) : isRunningInBackground ? ( localize(7430, "Running {0} in background", commandText)) : isComplete ? ( localize(7431, "Ran {0}", commandText)) : ( localize(7432, "Running {0}", commandText));
+        const title = isSkipped ? ( localize(7568, "Skipped {0}", commandText)) : isRunningInBackground ? ( localize(7569, "Running {0} in background", commandText)) : isComplete ? ( localize(7570, "Ran {0}", commandText)) : ( localize(7571, "Running {0}", commandText));
         super(title, context, undefined, hoverService, configurationService);
         this._showLinkDisposables = this._register(( new MutableDisposable()));
         this._terminalContentElement = contentElement;
@@ -1323,8 +1350,8 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         const labelElement = this._collapseButton.labelElement;
         labelElement.textContent = "";
         if (this._isSandboxWrapped) {
-            const prefixText = this._isSkipped ? ( localize(7433, "Skipped ")) : this._isComplete ? ( localize(7434, "Ran ")) : ( localize(7435, "Running "));
-            const suffixText = this._isRunningInBackground ? ( localize(7436, " in sandbox (background)")) : ( localize(7437, " in sandbox"));
+            const prefixText = this._isSkipped ? ( localize(7572, "Skipped ")) : this._isComplete ? ( localize(7573, "Ran ")) : ( localize(7574, "Running "));
+            const suffixText = this._isRunningInBackground ? ( localize(7575, " in sandbox (background)")) : ( localize(7576, " in sandbox"));
             labelElement.appendChild(createTextNode(prefixText));
             const codeElement = createElement("code");
             codeElement.textContent = this._commandText;
@@ -1332,14 +1359,14 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
             labelElement.appendChild(createTextNode(suffixText));
             return;
         }
-        const prefixText = this._isSkipped ? ( localize(7438, "Skipped ")) : this._isComplete ? ( localize(7439, "Ran ")) : ( localize(7440, "Running "));
+        const prefixText = this._isSkipped ? ( localize(7577, "Skipped ")) : this._isComplete ? ( localize(7578, "Ran ")) : ( localize(7579, "Running "));
         const ranText = createTextNode(prefixText);
         const codeElement = createElement("code");
         codeElement.textContent = this._commandText;
         labelElement.appendChild(ranText);
         labelElement.appendChild(codeElement);
         if (this._isRunningInBackground) {
-            labelElement.appendChild(createTextNode(( localize(7441, " in background"))));
+            labelElement.appendChild(createTextNode(( localize(7580, " in background"))));
         }
     }
     _updateShowLink() {
@@ -1355,7 +1382,7 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         const container = $("span.chat-terminal-show-link-container");
         container.appendChild(createTextNode(" — "));
         const showLink = $("span.chat-terminal-show-link");
-        showLink.textContent = ( localize(7442, "Show"));
+        showLink.textContent = ( localize(7581, "Show"));
         showLink.role = "button";
         showLink.tabIndex = 0;
         store.add(addDisposableListener(showLink, EventType.CLICK, e => {

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

@@ -54,7 +54,7 @@ class ChatToolConfirmationCarouselPart extends Disposable {
         this.domNode = elements.root;
         this.domNode.tabIndex = -1;
         this.domNode.setAttribute("role", "group");
-        this.domNode.setAttribute("aria-label", ( localize(7443, "Tool confirmation carousel")));
+        this.domNode.setAttribute("aria-label", ( localize(7582, "Tool confirmation carousel")));
         this.collapsedTitle = elements.collapsedTitle;
         this.agentLabel = elements.agentLabel;
         this.contentContainer = elements.content;
@@ -74,7 +74,7 @@ class ChatToolConfirmationCarouselPart extends Disposable {
             small: true
         })));
         this.allowAllButton.element.classList.add("chat-tool-carousel-allow-all-button");
-        this.allowAllButton.label = ( localize(7444, "Allow All"));
+        this.allowAllButton.label = ( localize(7583, "Allow All"));
         this._register(this.allowAllButton.onDidClick(() => this.allowAll()));
         this.expandContentButton = this._register(( new Button(elements.overlayActions, {
             ...defaultButtonStyles,
@@ -96,7 +96,7 @@ class ChatToolConfirmationCarouselPart extends Disposable {
         })));
         this.dismissButton.element.classList.add("chat-tool-carousel-dismiss-button");
         this.dismissButton.label = `$(${Codicon.close.id})`;
-        const dismissButtonLabel = this.items.length === 1 ? ( localize(7445, "Skip")) : ( localize(7446, "Skip All"));
+        const dismissButtonLabel = this.items.length === 1 ? ( localize(7584, "Skip")) : ( localize(7585, "Skip All"));
         this.dismissButton.element.setAttribute("aria-label", dismissButtonLabel);
         this.dismissButton.element.title = dismissButtonLabel;
         this._register(this.dismissButton.onDidClick(() => this.skipAll()));
@@ -107,7 +107,7 @@ class ChatToolConfirmationCarouselPart extends Disposable {
         })));
         this.prevButton.element.classList.add("chat-tool-carousel-nav-arrow");
         this.prevButton.label = `$(${Codicon.chevronLeft.id})`;
-        this.prevButton.element.setAttribute("aria-label", ( localize(7447, "Previous")));
+        this.prevButton.element.setAttribute("aria-label", ( localize(7586, "Previous")));
         this._register(this.prevButton.onDidClick(() => this.navigateRelative(-1)));
         this.nextButton = this._register(( new Button(elements.navArrows, {
             ...defaultButtonStyles,
@@ -116,7 +116,7 @@ class ChatToolConfirmationCarouselPart extends Disposable {
         })));
         this.nextButton.element.classList.add("chat-tool-carousel-nav-arrow");
         this.nextButton.label = `$(${Codicon.chevronRight.id})`;
-        this.nextButton.element.setAttribute("aria-label", ( localize(7448, "Next")));
+        this.nextButton.element.setAttribute("aria-label", ( localize(7587, "Next")));
         this._register(this.nextButton.onDidClick(() => this.navigateRelative(1)));
         this._register(addDisposableListener(this.agentLabel, "click", e => {
             e.preventDefault();
@@ -308,7 +308,7 @@ class ChatToolConfirmationCarouselPart extends Disposable {
         if (item?.agentName) {
             this.agentLabel.textContent = `\u2014 ${item.agentName}`;
             this.agentLabel.disabled = !item.subAgentInvocationId || !item.scrollToSubagent;
-            this.agentLabel.title = ( localize(7449, "Scroll to {0}", item.agentName));
+            this.agentLabel.title = ( localize(7588, "Scroll to {0}", item.agentName));
             this.agentLabel.setAttribute("aria-label", this.agentLabel.title);
             show(this.agentLabel);
         } else {
@@ -326,7 +326,7 @@ class ChatToolConfirmationCarouselPart extends Disposable {
         setVisibility(multi, this.nextButton.element);
         setVisibility(multi, this.allowAllButton.element);
         setVisibility(this.canExpandContent, this.expandContentButton.element);
-        this.allowAllButton.label = multi ? ( localize(7444, "Allow All")) : ( localize(7450, "Allow"));
+        this.allowAllButton.label = multi ? ( localize(7583, "Allow All")) : ( localize(7589, "Allow"));
         this.updateExpandContentButton();
     }
     renderActiveContent() {
@@ -381,7 +381,7 @@ class ChatToolConfirmationCarouselPart extends Disposable {
     }
     updateExpandContentButton() {
         const expanded = this.canExpandContent && this._isContentExpanded;
-        const label = expanded ? ( localize(7451, "Restore Confirmation Size")) : ( localize(7452, "Expand Confirmation Up"));
+        const label = expanded ? ( localize(7590, "Restore Confirmation Size")) : ( localize(7591, "Expand Confirmation Up"));
         this.expandContentButton.label = expanded ? `$(${Codicon.screenNormal.id})` : `$(${Codicon.screenFull.id})`;
         this.expandContentButton.element.setAttribute("aria-label", label);
         this.expandContentButton.element.setAttribute("aria-expanded", String(expanded));

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

@@ -78,8 +78,8 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         this.render({
             allowActionId: AcceptToolConfirmationActionId,
             skipActionId: SkipToolConfirmationActionId,
-            allowLabel: state.confirmationMessages.confirmResults ? ( localize(7453, "Allow and Review Once")) : ( localize(7454, "Allow Once")),
-            skipLabel: ( localize(7455, "Proceed without running this tool")),
+            allowLabel: state.confirmationMessages.confirmResults ? ( localize(7592, "Allow and Review Once")) : ( localize(7593, "Allow Once")),
+            skipLabel: ( localize(7594, "Proceed without running this tool")),
             partType: "chatToolConfirmation",
             subtitle: typeof toolInvocation.originMessage === "string" ? toolInvocation.originMessage : toolInvocation.originMessage?.value
         });
@@ -125,7 +125,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         }
         if (state.confirmationMessages?.confirmResults) {
             actions.unshift({
-                label: ( localize(7456, "Allow and Skip Reviewing Result")),
+                label: ( localize(7595, "Allow and Skip Reviewing Result")),
                 data: () => {
                     state.confirmationMessages.confirmResults = undefined;
                     this.confirmWith(this.toolInvocation, {
@@ -167,11 +167,11 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
             };
             const elements = h("div", [h(".message@messageContainer", [
                 h(".message-wrapper@message"),
-                h(".see-more@showMore", [h("a", [( localize(7457, "Show More"))])])
+                h(".see-more@showMore", [h("a", [( localize(7596, "Show More"))])])
             ]), h(".editor@editor"), h(".disclaimer@disclaimer")]);
             if (toolInvocation.toolSpecificData?.kind === "input" && toolInvocation.toolSpecificData.rawInput && !isEmptyObject(toolInvocation.toolSpecificData.rawInput)) {
                 const titleEl = createElement("h3");
-                titleEl.textContent = ( localize(7458, "Input"));
+                titleEl.textContent = ( localize(7597, "Input"));
                 elements.editor.appendChild(titleEl);
                 const inputData = toolInvocation.toolSpecificData;
                 const codeBlockRenderOptions = {
@@ -241,7 +241,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
                 elements.editor.append(editor.object.element);
                 if (canSeeMore) {
                     const seeMore = h("div.see-more", [h("a@link")]);
-                    seeMore.link.textContent = ( localize(7459, "See more"));
+                    seeMore.link.textContent = ( localize(7598, "See more"));
                     this._register(addDisposableGenericMouseDownListener(seeMore.link, () => {
                         try {
                             const parsed = JSON.parse(model.getValue());

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

@@ -67,7 +67,7 @@ let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvo
             parent.style.height = `${partState.height}px`;
         }
         const progressMessage = $("span");
-        progressMessage.textContent = ( localize(7460, "Rendering tool output..."));
+        progressMessage.textContent = ( localize(7599, "Rendering tool output..."));
         const progressPart = this._register(this.instantiationService.createInstance(
             ChatProgressSubPart,
             progressMessage,
@@ -110,7 +110,7 @@ let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvo
             iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.error));
             errorHeaderNode.append(iconElement);
             const errorTitleNode = $(".output-error-title");
-            errorTitleNode.textContent = ( localize(7461, "Error rendering the tool output"));
+            errorTitleNode.textContent = ( localize(7600, "Error rendering the tool output"));
             errorHeaderNode.append(errorTitleNode);
             const errorMessageNode = $(".output-error-details");
             errorMessageNode.textContent = error?.message || String(error);

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

@@ -1,11 +1,11 @@
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { ConfirmedReason, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 export declare function isMcpToolInvocation(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): boolean;
+export declare function isAskQuestionsToolInvocation(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): boolean;
 /**
  * Determines whether a tool invocation's progress text should shimmer.
- * MCP tools shimmer; askQuestions defers to the caller's default; all others opt out.
  */
-export declare function shouldShimmerForTool(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): boolean;
+export declare function shouldShimmerForTool(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, content: string | IMarkdownString | undefined): boolean;
 /**
  * Creates a markdown message explaining why a tool was auto-approved.
  * @param toolInvocation The tool invocation to get the approval message for

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

@@ -6,14 +6,17 @@ import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-a
 function isMcpToolInvocation(toolInvocation) {
     return toolInvocation.source?.type === "mcp" || toolInvocation.toolId.toLowerCase().includes("mcp");
 }
-function shouldShimmerForTool(toolInvocation) {
-    if (isMcpToolInvocation(toolInvocation)) {
-        return !IChatToolInvocation.isComplete(toolInvocation);
-    }
-    if (toolInvocation.toolId === "copilot_askQuestions" || toolInvocation.toolId === "vscode_askQuestions") {
+function isAskQuestionsToolInvocation(toolInvocation) {
+    return toolInvocation.toolId === "copilot_askQuestions" || toolInvocation.toolId === "vscode_askQuestions";
+}
+function shouldShimmerForTool(toolInvocation, content) {
+    if (!isAskQuestionsToolInvocation(toolInvocation) || IChatToolInvocation.isComplete(toolInvocation)) {
         return false;
     }
-    return false;
+    return getMarkdownValue(content) === getMarkdownValue(toolInvocation.invocationMessage);
+}
+function getMarkdownValue(content) {
+    return (typeof content === "string" ? content : content?.value)?.replaceAll(" ", " ").replace(/\\[\\`*_{}\[\]()#+\-!~]/g, escaped => escaped.slice(1));
 }
 function getToolApprovalMessage(toolInvocation) {
     const reason = IChatToolInvocation.executionConfirmedOrDenied(toolInvocation);
@@ -26,20 +29,20 @@ function getApprovalMessageFromReason(reason) {
     let md;
     switch (reason.type) {
     case ToolConfirmKind.Setting:
-        md = ( localize(7462, "Auto approved by {0}", createMarkdownCommandLink({
+        md = ( localize(7601, "Auto approved by {0}", createMarkdownCommandLink({
             text: "`" + reason.id + "`",
             id: "workbench.action.openSettings",
             arguments: [reason.id],
-            tooltip: ( localize(7463, "Open settings"))
+            tooltip: ( localize(7602, "Open settings"))
         }, false)));
         break;
     case ToolConfirmKind.LmServicePerTool:
-        md = reason.scope === "session" ? ( localize(7464, "Auto approved for this session")) : reason.scope === "workspace" ? ( localize(7465, "Auto approved for this workspace")) : ( localize(7466, "Auto approved for this profile"));
+        md = reason.scope === "session" ? ( localize(7603, "Auto approved for this session")) : reason.scope === "workspace" ? ( localize(7604, "Auto approved for this workspace")) : ( localize(7605, "Auto approved for this profile"));
         md += " (" + createMarkdownCommandLink({
-            text: ( localize(7467, "Edit")),
+            text: ( localize(7606, "Edit")),
             id: "workbench.action.chat.editToolApproval",
             arguments: [reason.scope],
-            tooltip: ( localize(7468, "Edit tool approval settings"))
+            tooltip: ( localize(7607, "Edit tool approval settings"))
         }) + ")";
         break;
     case ToolConfirmKind.ConfirmationNotNeeded:
@@ -59,4 +62,4 @@ function getApprovalMessageFromReason(reason) {
     }));
 }
 
-export { getApprovalMessageFromReason, getToolApprovalMessage, isMcpToolInvocation, shouldShimmerForTool };
+export { getApprovalMessageFromReason, getToolApprovalMessage, isAskQuestionsToolInvocation, isMcpToolInvocation, shouldShimmerForTool };

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

@@ -46,8 +46,8 @@ let ChatToolPostExecuteConfirmationPart = class ChatToolPostExecuteConfirmationP
         this.render({
             allowActionId: AcceptToolPostConfirmationActionId,
             skipActionId: SkipToolPostConfirmationActionId,
-            allowLabel: ( localize(7469, "Allow Once")),
-            skipLabel: ( localize(7470, "Skip Results")),
+            allowLabel: ( localize(7608, "Allow Once")),
+            skipLabel: ( localize(7609, "Skip Results")),
             partType: "chatToolPostConfirmation",
             subtitle: typeof subtitle === "string" ? subtitle : subtitle?.value
         });
@@ -63,7 +63,7 @@ let ChatToolPostExecuteConfirmationPart = class ChatToolPostExecuteConfirmationP
         return this.createResultsDisplay(this.toolInvocation, state.contentForModel);
     }
     getTitle() {
-        return localize(7471, "Approve Tool Result");
+        return localize(7610, "Approve Tool Result");
     }
     additionalPrimaryActions() {
         const actions = super.additionalPrimaryActions();
@@ -99,7 +99,7 @@ let ChatToolPostExecuteConfirmationPart = class ChatToolPostExecuteConfirmationP
     createResultsDisplay(toolInvocation, contentForModel) {
         const container = $(".tool-postconfirm-display");
         if (!contentForModel || contentForModel.length === 0) {
-            container.textContent = ( localize(7472, "No results to display"));
+            container.textContent = ( localize(7611, "No results to display"));
             return container;
         }
         const parts = [];
@@ -214,7 +214,7 @@ let ChatToolPostExecuteConfirmationPart = class ChatToolPostExecuteConfirmationP
             outputSubPart.domNode.classList.add("tool-postconfirm-display");
             return outputSubPart.domNode;
         }
-        container.textContent = ( localize(7473, "No displayable results"));
+        container.textContent = ( localize(7612, "No displayable results"));
         return container;
     }
 };

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

@@ -17,6 +17,7 @@ export declare class ChatToolProgressSubPart extends BaseChatToolInvocationSubPa
     private createProgressPart;
     private get toolIsConfirmed();
     private renderProgressContent;
+    private getProgressIcon;
     private getAnnouncementKey;
     private computeShouldAnnounce;
     private provideScreenReaderStatus;

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

@@ -3,9 +3,11 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { createElement, clearNode, reset } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { status } 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 { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
@@ -89,18 +91,23 @@ let ChatToolProgressSubPart = class ChatToolProgressSubPart extends BaseChatTool
         if (shouldAnnounce) {
             this.provideScreenReaderStatus(content);
         }
+        const shouldShimmer = shouldShimmerForTool(this.toolInvocation, content);
         return this.instantiationService.createInstance(
             ChatProgressContentPart,
             progressMessage,
             this.renderer,
             this.context,
-            undefined,
+            shouldShimmer ? true : undefined,
             true,
-            this.getIcon(),
+            this.getProgressIcon(),
             this.toolInvocation,
-            shouldShimmerForTool(this.toolInvocation)
+            shouldShimmer
         );
     }
+    getProgressIcon() {
+        const icon = this.getIcon();
+        return ThemeIcon.isEqual(icon, ThemeIcon.modify(Codicon.loading, "spin")) ? Codicon.check : icon;
+    }
     getAnnouncementKey(kind) {
         return `${kind}:${this.toolInvocation.toolCallId}`;
     }

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

@@ -50,8 +50,8 @@ export declare class TerminalToolAutoExpand extends Disposable {
     private readonly _options;
     private _commandFinished;
     private _receivedData;
-    private _dataEventTimeout;
-    private _noDataTimeout;
+    private readonly _dataEventTimeout;
+    private readonly _noDataTimeout;
     private readonly _onDidRequestExpand;
     readonly onDidRequestExpand: Event<void>;
     constructor(_options: ITerminalToolAutoExpandOptions);

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

@@ -1,5 +1,5 @@
 
-import { Disposable, 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 { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 
@@ -14,6 +14,8 @@ class TerminalToolAutoExpand extends Disposable {
         this._options = _options;
         this._commandFinished = false;
         this._receivedData = false;
+        this._dataEventTimeout = this._register(( new MutableDisposable()));
+        this._noDataTimeout = this._register(( new MutableDisposable()));
         this._onDidRequestExpand = this._register(( new Emitter()));
         this.onDidRequestExpand = this._onDidRequestExpand.event;
         this._setupListeners();
@@ -21,14 +23,13 @@ class TerminalToolAutoExpand extends Disposable {
     _setupListeners() {
         const store = this._register(( new DisposableStore()));
         store.add(this._options.onCommandExecuted(() => {
-            if (this._options.shouldAutoExpand() && !this._noDataTimeout) {
-                this._noDataTimeout = disposableTimeout(() => {
-                    this._noDataTimeout = undefined;
+            if (this._options.shouldAutoExpand() && !this._noDataTimeout.value) {
+                this._noDataTimeout.value = disposableTimeout(() => {
+                    this._noDataTimeout.clear();
                     const shouldExpand = this._options.shouldAutoExpand();
                     const hasOutput = this._options.hasRealOutput();
                     if (shouldExpand && hasOutput) {
-                        this._dataEventTimeout?.dispose();
-                        this._dataEventTimeout = undefined;
+                        this._dataEventTimeout.clear();
                         this._onDidRequestExpand.fire();
                     }
                 }, TerminalToolAutoExpandTimeout.NoData, store);
@@ -39,14 +40,13 @@ class TerminalToolAutoExpand extends Disposable {
                 return;
             }
             this._receivedData = true;
-            if (this._options.shouldAutoExpand() && !this._dataEventTimeout) {
-                this._dataEventTimeout = disposableTimeout(() => {
-                    this._dataEventTimeout = undefined;
+            if (this._options.shouldAutoExpand() && !this._dataEventTimeout.value) {
+                this._dataEventTimeout.value = disposableTimeout(() => {
+                    this._dataEventTimeout.clear();
                     const shouldExpand = this._options.shouldAutoExpand();
                     const hasOutput = this._options.hasRealOutput();
                     if (!this._commandFinished && shouldExpand && hasOutput) {
-                        this._noDataTimeout?.dispose();
-                        this._noDataTimeout = undefined;
+                        this._noDataTimeout.clear();
                         this._onDidRequestExpand.fire();
                     }
                 }, TerminalToolAutoExpandTimeout.DataEvent, store);
@@ -58,10 +58,8 @@ class TerminalToolAutoExpand extends Disposable {
         }));
     }
     _clearAutoExpandTimeouts() {
-        this._dataEventTimeout?.dispose();
-        this._dataEventTimeout = undefined;
-        this._noDataTimeout?.dispose();
-        this._noDataTimeout = undefined;
+        this._dataEventTimeout.clear();
+        this._noDataTimeout.clear();
     }
 }