@codingame/monaco-vscode-katex-common 28.4.0 → 29.0.0

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

@@ -13,7 +13,9 @@ import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { ChatQueryTitlePart } from '../chatConfirmationWidget.js';
 import { ChatMarkdownContentPart } from '../chatMarkdownContentPart.js';
 import { ChatProgressSubPart } from '../chatProgressContentPart.js';
+import { ChatResourceGroupWidget } from '../chatResourceGroupWidget.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { extractImagesFromToolInvocationOutputDetails } from '../../../../common/chatImageExtraction.js';
 import { TerminalToolAutoExpand } from './terminalToolAutoExpand.js';
 import { ChatCollapsibleContentPart } from '../chatCollapsibleContentPart.js';
 import * as chatTerminalToolProgressPart from '../media/chatTerminalToolProgressPart.css';
@@ -34,7 +36,7 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
 import { IAccessibleViewService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { AccessibilityWorkbenchSettingId, AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { DetachedTerminalCommandMirror, DetachedTerminalSnapshotMirror } from '../../../../../terminal/browser/chatTerminalCommandMirror.js';
@@ -281,7 +283,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const markdownOptions = {
             codeBlockRenderOptions,
             accessibilityOptions: pastTenseMessage ? {
-                statusMessage: ( localize(6681, "{0}", stripIcons(pastTenseMessage)))
+                statusMessage: ( localize(6881, "{0}", stripIcons(pastTenseMessage)))
             } : undefined
         };
         this.markdownPart = this._register(_instantiationService.createInstance(
@@ -314,23 +316,57 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             this.domNode = this._createCollapsibleWrapper(progressPart.domNode, displayCommand, toolInvocation, context);
         } else {
             this.domNode = progressPart.domNode;
-            const updateCheckmarks = () => this.domNode.classList.toggle(
-                "show-checkmarks",
-                !!this._configurationService.getValue(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)
-            );
-            updateCheckmarks();
-            this._register(this._configurationService.onDidChangeConfiguration(e => {
-                if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
-                    updateCheckmarks();
-                }
-            }));
         }
+        this._renderImagePills(toolInvocation, context, elements.container);
         const hasStoredOutput = !!terminalData.terminalCommandOutput;
         if (expandedStateByInvocation.get(toolInvocation) || (this._isInThinkingContainer && IChatToolInvocation.isComplete(toolInvocation) && hasStoredOutput)) {
             void this._toggleOutput(true);
         }
         this._register(this._terminalChatService.registerProgressPart(this));
     }
+    _renderImagePills(toolInvocation, context, innerContainer) {
+        const renderImages = () => {
+            const extracted = extractImagesFromToolInvocationOutputDetails(toolInvocation, context.element.sessionResource);
+            const imageParts = ( extracted.map(img => ({
+                kind: "data",
+                value: img.data.buffer,
+                mimeType: img.mimeType,
+                uri: img.uri
+            })));
+            if (imageParts.length === 0) {
+                return;
+            }
+            const widget = this._register(
+                this._instantiationService.createInstance(ChatResourceGroupWidget, imageParts)
+            );
+            if (this._thinkingCollapsibleWrapper) {
+                const wrapper = this._thinkingCollapsibleWrapper;
+                const placeWidget = expanded => {
+                    if (expanded) {
+                        innerContainer.appendChild(widget.domNode);
+                    } else {
+                        wrapper.domNode.appendChild(widget.domNode);
+                    }
+                };
+                placeWidget(wrapper.expanded.get());
+                this._register(autorun(reader => {
+                    placeWidget(wrapper.expanded.read(reader));
+                }));
+            } else {
+                innerContainer.appendChild(widget.domNode);
+            }
+        };
+        if (toolInvocation.kind === "toolInvocationSerialized") {
+            renderImages();
+        } else {
+            this._register(autorun(reader => {
+                const state = toolInvocation.state.read(reader);
+                if (state.type === IChatToolInvocation.StateKind.Completed) {
+                    renderImages();
+                }
+            }));
+        }
+    }
     _createCollapsibleWrapper(contentElement, commandText, toolInvocation, context) {
         const truncatedCommand = commandText.length > MAX_COMMAND_TITLE_LENGTH ? commandText.substring(0, MAX_COMMAND_TITLE_LENGTH) + "..." : commandText;
         const isComplete = IChatToolInvocation.isComplete(toolInvocation);
@@ -340,6 +376,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const wrapper = this._register(this._instantiationService.createInstance(
             ChatTerminalThinkingCollapsibleWrapper,
             truncatedCommand,
+            this._terminalData.commandLine.isSandboxWrapped === true,
             contentElement,
             context,
             initialExpanded,
@@ -861,7 +898,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return;
         }
-        const ariaLabel = ( localize(6682, "Terminal output for {0}", commandText));
+        const ariaLabel = ( localize(6882, "Terminal output for {0}", commandText));
         const scrollableDomNode = this._scrollableContainer.getDomNode();
         scrollableDomNode.setAttribute("role", "region");
         const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.TerminalChatOutput);
@@ -874,26 +911,26 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return undefined;
         }
-        const commandHeader = ( localize(6683, "Command: {0}", commandText));
+        const commandHeader = ( localize(6883, "Command: {0}", commandText));
         if (command) {
             const rawOutput = command.getOutput();
             if (!rawOutput || rawOutput.trim().length === 0) {
-                return `${commandHeader}\n${( localize(6684, "No output was produced by the command."))}`;
+                return `${commandHeader}\n${( localize(6884, "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(6685, "Command output is no longer available."))}`;
+            return `${commandHeader}\n${( localize(6885, "Command output is no longer available."))}`;
         }
         const plain = removeAnsiEscapeCodes((snapshot.text ?? ""));
         if (!plain.trim().length) {
-            return `${commandHeader}\n${( localize(6684, "No output was produced by the command."))}`;
+            return `${commandHeader}\n${( localize(6884, "No output was produced by the command."))}`;
         }
         let outputText = plain.trimEnd();
         if (snapshot.truncated) {
-            outputText += `\n${( localize(6686, "Output truncated."))}`;
+            outputText += `\n${( localize(6886, "Output truncated."))}`;
         }
         return `${commandHeader}\n${outputText}`;
     }
@@ -1002,7 +1039,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         }
         if (!hasOutput) {
             if (commandFinished) {
-                this._showEmptyMessage(( localize(6684, "No output was produced by the command.")));
+                this._showEmptyMessage(( localize(6884, "No output was produced by the command.")));
             }
         } else {
             this._hideEmptyMessage();
@@ -1029,7 +1066,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (hasText) {
             this._hideEmptyMessage();
         } else {
-            this._showEmptyMessage(( localize(6684, "No output was produced by the command.")));
+            this._showEmptyMessage(( localize(6884, "No output was produced by the command.")));
         }
         const lineCount = result?.lineCount ?? snapshot.lineCount ?? 0;
         this._layoutOutput(lineCount);
@@ -1038,9 +1075,9 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         clearNode(this._terminalContainer);
         this._lastRenderedLineCount = undefined;
         if (!liveTerminalInstance) {
-            this._showEmptyMessage(( localize(6687, "Terminal is no longer available.")));
+            this._showEmptyMessage(( localize(6887, "Terminal is no longer available.")));
         } else {
-            this._showEmptyMessage(( localize(6688, "Command information is not available.")));
+            this._showEmptyMessage(( localize(6888, "Command information is not available.")));
         }
     }
     async _resolveLiveTerminal() {
@@ -1159,7 +1196,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
 ChatTerminalToolOutputSection = ( __decorate([( __param(5, IAccessibleViewService)), ( __param(6, IInstantiationService)), ( __param(7, ITerminalConfigurationService)), ( __param(8, IThemeService)), ( __param(9, IContextKeyService))], ChatTerminalToolOutputSection));
 let ToggleChatTerminalOutputAction = class ToggleChatTerminalOutputAction extends Action {
     constructor(_toggle, _keybindingService, _telemetryService) {
-        super(TerminalContribCommandId.ToggleChatTerminalOutput, ( localize(6689, "Show Output")), ThemeIcon.asClassName(Codicon.chevronRight), true);
+        super(TerminalContribCommandId.ToggleChatTerminalOutput, ( localize(6889, "Show Output")), ThemeIcon.asClassName(Codicon.chevronRight), true);
         this._toggle = _toggle;
         this._keybindingService = _keybindingService;
         this._telemetryService = _telemetryService;
@@ -1182,10 +1219,10 @@ let ToggleChatTerminalOutputAction = class ToggleChatTerminalOutputAction extend
     }
     _updatePresentation() {
         if (this._expanded) {
-            this.label = ( localize(6690, "Hide Output"));
+            this.label = ( localize(6890, "Hide Output"));
             this.class = ThemeIcon.asClassName(Codicon.chevronDown);
         } else {
-            this.label = ( localize(6689, "Show Output"));
+            this.label = ( localize(6889, "Show Output"));
             this.class = ThemeIcon.asClassName(Codicon.chevronRight);
         }
     }
@@ -1209,7 +1246,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
     ) {
         super(
             TerminalContribCommandId.FocusChatInstanceAction,
-            isTerminalHidden ? ( localize(6691, "Show and Focus Terminal")) : ( localize(6692, "Focus Terminal")),
+            isTerminalHidden ? ( localize(6891, "Show and Focus Terminal")) : ( localize(6892, "Focus Terminal")),
             ThemeIcon.asClassName(Codicon.openInProduct),
             true
         );
@@ -1225,7 +1262,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
         this._updateTooltip();
     }
     async run() {
-        this.label = this._instance?.shellLaunchConfig.hideFromUser ? ( localize(6693, "Show and Focus Terminal")) : ( localize(6692, "Focus Terminal"));
+        this.label = this._instance?.shellLaunchConfig.hideFromUser ? ( localize(6893, "Show and Focus Terminal")) : ( localize(6892, "Focus Terminal"));
         this._updateTooltip();
         let target = "none";
         let location = "panel";
@@ -1282,7 +1319,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
 FocusChatInstanceAction = ( __decorate([( __param(5, ITerminalService)), ( __param(6, ITerminalEditorService)), ( __param(7, ITerminalGroupService)), ( __param(8, IKeybindingService)), ( __param(9, ITelemetryService))], FocusChatInstanceAction));
 let ContinueInBackgroundAction = class ContinueInBackgroundAction extends Action {
     constructor(_terminalToolSessionId, _terminalChatService) {
-        super(TerminalContribCommandId.ContinueInBackground, ( localize(6694, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true);
+        super(TerminalContribCommandId.ContinueInBackground, ( localize(6894, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true);
         this._terminalToolSessionId = _terminalToolSessionId;
         this._terminalChatService = _terminalChatService;
     }
@@ -1294,6 +1331,7 @@ ContinueInBackgroundAction = ( __decorate([( __param(1, ITerminalChatService))],
 let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsibleWrapper extends ChatCollapsibleContentPart {
     constructor(
         commandText,
+        isSandboxWrapped,
         contentElement,
         context,
         initialExpanded,
@@ -1301,10 +1339,11 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         hoverService,
         configurationService
     ) {
-        const title = isComplete ? `Ran \`${commandText}\`` : `Running \`${commandText}\``;
+        const title = isComplete ? ( localize(6895, "Ran {0}", commandText)) : ( localize(6896, "Running {0}", commandText));
         super(title, context, undefined, hoverService, configurationService);
         this._terminalContentElement = contentElement;
         this._commandText = commandText;
+        this._isSandboxWrapped = isSandboxWrapped;
         this._isComplete = isComplete;
         this.domNode.classList.add("chat-terminal-thinking-collapsible");
         if (isComplete) {
@@ -1319,7 +1358,17 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         }
         const labelElement = this._collapseButton.labelElement;
         labelElement.textContent = "";
-        const prefixText = this._isComplete ? ( localize(6695, "Ran ")) : ( localize(6696, "Running "));
+        if (this._isSandboxWrapped) {
+            const prefixText = this._isComplete ? ( localize(6897, "Ran ")) : ( localize(6898, "Running "));
+            const suffixText = ( localize(6899, " in sandbox"));
+            labelElement.appendChild(createTextNode(prefixText));
+            const codeElement = createElement("code");
+            codeElement.textContent = this._commandText;
+            labelElement.appendChild(codeElement);
+            labelElement.appendChild(createTextNode(suffixText));
+            return;
+        }
+        const prefixText = this._isComplete ? ( localize(6900, "Ran ")) : ( localize(6901, "Running "));
         const ranText = createTextNode(prefixText);
         const codeElement = createElement("code");
         codeElement.textContent = this._commandText;
@@ -1346,6 +1395,6 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         return false;
     }
 };
-ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(5, IHoverService)), ( __param(6, IConfigurationService))], ChatTerminalThinkingCollapsibleWrapper));
+ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(6, IHoverService)), ( __param(7, IConfigurationService))], ChatTerminalThinkingCollapsibleWrapper));
 
-export { ChatTerminalToolProgressPart, ContinueInBackgroundAction, FocusChatInstanceAction, ToggleChatTerminalOutputAction };
+export { ChatTerminalThinkingCollapsibleWrapper, ChatTerminalToolProgressPart, ContinueInBackgroundAction, FocusChatInstanceAction, ToggleChatTerminalOutputAction };

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

@@ -31,6 +31,7 @@ export declare class ToolConfirmationSubPart extends AbstractToolConfirmationSub
     get codeblocks(): IChatCodeBlockInfo[];
     constructor(toolInvocation: IChatToolInvocation, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockModelCollection: CodeBlockModelCollection, codeBlockStartIndex: number, instantiationService: IInstantiationService, keybindingService: IKeybindingService, languageService: ILanguageService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, commandService: ICommandService, markerService: IMarkerService, languageModelToolsService: ILanguageModelToolsService, chatMarkdownAnchorService: IChatMarkdownAnchorService, confirmationService: ILanguageModelToolsConfirmationService);
     protected additionalPrimaryActions(): (Separator | import("./abstractToolConfirmationSubPart.js").IAbstractToolPrimaryAction)[];
+    protected useAllowOnceAsPrimary(): boolean;
     protected createContentElement(): HTMLElement | string;
     protected getTitle(): string;
     private _makeMarkdownPart;

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

@@ -79,8 +79,8 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         this.render({
             allowActionId: AcceptToolConfirmationActionId,
             skipActionId: SkipToolConfirmationActionId,
-            allowLabel: state.confirmationMessages.confirmResults ? ( localize(6697, "Allow and Review Once")) : ( localize(6698, "Allow Once")),
-            skipLabel: ( localize(6699, "Proceed without running this tool")),
+            allowLabel: state.confirmationMessages.confirmResults ? ( localize(6902, "Allow and Review Once")) : ( localize(6903, "Allow Once")),
+            skipLabel: ( localize(6904, "Proceed without running this tool")),
             partType: "chatToolConfirmation",
             subtitle: typeof toolInvocation.originMessage === "string" ? toolInvocation.originMessage : toolInvocation.originMessage?.value
         });
@@ -92,11 +92,17 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
             return actions;
         }
         if (state.confirmationMessages?.allowAutoConfirm !== false) {
+            const approveCombination = state.confirmationMessages?.approveCombination;
+            const combination = approveCombination ? {
+                label: typeof approveCombination.label === "string" ? approveCombination.label : approveCombination.label.value,
+                key: approveCombination.key
+            } : undefined;
             const confirmActions = this.confirmationService.getPreConfirmActions({
                 toolId: this.toolInvocation.toolId,
                 source: this.toolInvocation.source,
                 parameters: state.parameters,
-                chatSessionResource: this.context.element.sessionResource
+                chatSessionResource: this.context.element.sessionResource,
+                combination
             });
             for (const action of confirmActions) {
                 if (action.divider) {
@@ -119,7 +125,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         }
         if (state.confirmationMessages?.confirmResults) {
             actions.unshift({
-                label: ( localize(6700, "Allow and Skip Reviewing Result")),
+                label: ( localize(6905, "Allow and Skip Reviewing Result")),
                 data: () => {
                     state.confirmationMessages.confirmResults = undefined;
                     this.confirmWith(this.toolInvocation, {
@@ -130,6 +136,13 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         }
         return actions;
     }
+    useAllowOnceAsPrimary() {
+        const state = this.toolInvocation.state.get();
+        if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
+            return !!state.confirmationMessages?.approveCombination;
+        }
+        return false;
+    }
     createContentElement() {
         const state = this.toolInvocation.state.get();
         if (state.type !== IChatToolInvocation.StateKind.WaitingForConfirmation) {
@@ -154,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(6701, "Show More"))])])
+                h(".see-more@showMore", [h("a", [( localize(6906, "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(6702, "Input"));
+                titleEl.textContent = ( localize(6907, "Input"));
                 elements.editor.appendChild(titleEl);
                 const inputData = toolInvocation.toolSpecificData;
                 const codeBlockRenderOptions = {
@@ -234,7 +247,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(6703, "See more"));
+                    seeMore.link.textContent = ( localize(6908, "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/chatToolInvocationPart.js

@@ -13,6 +13,7 @@ import { ChatInputOutputMarkdownProgressPart } from './chatInputOutputMarkdownPr
 import { ChatMcpAppSubPart } from './chatMcpAppSubPart.js';
 import { ChatResultListSubPart } from './chatResultListSubPart.js';
 import { ChatSimpleToolProgressPart } from './chatSimpleToolProgressPart.js';
+import { ChatModifiedFilesConfirmationSubPart } from './chatModifiedFilesConfirmationSubPart.js';
 import { ChatTerminalToolConfirmationSubPart } from './chatTerminalToolConfirmationSubPart.js';
 import { ChatTerminalToolProgressPart } from './chatTerminalToolProgressPart.js';
 import { ToolConfirmationSubPart } from './chatToolConfirmationSubPart.js';
@@ -98,7 +99,7 @@ let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
             this.subPart = partStore.add(this.createToolInvocationSubPart());
             subPartDomNode.replaceWith(this.subPart.domNode);
             subPartDomNode = this.subPart.domNode;
-            const isConfirmation = this.subPart instanceof ToolConfirmationSubPart || this.subPart instanceof ChatTerminalToolConfirmationSubPart || this.subPart instanceof ExtensionsInstallConfirmationWidgetSubPart || this.subPart instanceof ChatToolPostExecuteConfirmationPart;
+            const isConfirmation = this.subPart instanceof ToolConfirmationSubPart || this.subPart instanceof ChatTerminalToolConfirmationSubPart || this.subPart instanceof ChatModifiedFilesConfirmationSubPart || this.subPart instanceof ExtensionsInstallConfirmationWidgetSubPart || this.subPart instanceof ChatToolPostExecuteConfirmationPart;
             this.domNode.classList.toggle("has-confirmation", isConfirmation);
             partStore.add(this.subPart.onNeedsRerender(render));
         };
@@ -155,6 +156,13 @@ let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
                         this.codeBlockModelCollection,
                         this.codeBlockStartIndex
                     );
+                } else if (this.toolInvocation.toolSpecificData?.kind === "modifiedFilesConfirmation") {
+                    return this.instantiationService.createInstance(
+                        ChatModifiedFilesConfirmationSubPart,
+                        this.toolInvocation,
+                        this.context,
+                        this.listPool
+                    );
                 } else {
                     return this.instantiationService.createInstance(
                         ToolConfirmationSubPart,
@@ -235,6 +243,7 @@ let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
                 this.toolInvocation.pastTenseMessage ?? this.toolInvocation.invocationMessage,
                 this.toolInvocation.originMessage,
                 resultDetails.input,
+                resultDetails.inputLanguage,
                 resultDetails.output,
                 !!resultDetails.isError
             );
@@ -249,6 +258,7 @@ let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
                 this.toolInvocation.originMessage,
                 typeof this.toolInvocation.toolSpecificData.rawInput === "string" ? this.toolInvocation.toolSpecificData.rawInput : JSON.stringify(this.toolInvocation.toolSpecificData.rawInput, null, 2),
                 undefined,
+                undefined,
                 false
             );
         }

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

@@ -75,7 +75,7 @@ let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvo
             partState.webviewOrigin = partState.webviewOrigin;
         }
         const progressMessage = $("span");
-        progressMessage.textContent = ( localize(6704, "Rendering tool output..."));
+        progressMessage.textContent = ( localize(6909, "Rendering tool output..."));
         const progressPart = this._register(this.instantiationService.createInstance(
             ChatProgressSubPart,
             progressMessage,
@@ -125,7 +125,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(6705, "Error rendering the tool output"));
+            errorTitleNode.textContent = ( localize(6910, "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,5 +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;
+/**
+ * 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;
 /**
  * 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

@@ -3,6 +3,18 @@ import { MarkdownString, createMarkdownCommandLink } from '@codingame/monaco-vsc
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 
+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") {
+        return false;
+    }
+    return false;
+}
 function getToolApprovalMessage(toolInvocation) {
     const reason = IChatToolInvocation.executionConfirmedOrDenied(toolInvocation);
     if (!reason || typeof reason === "boolean") {
@@ -14,18 +26,20 @@ function getApprovalMessageFromReason(reason) {
     let md;
     switch (reason.type) {
     case ToolConfirmKind.Setting:
-        md = ( localize(6706, "Auto approved by {0}", createMarkdownCommandLink({
-            title: "`" + reason.id + "`",
+        md = ( localize(6911, "Auto approved by {0}", createMarkdownCommandLink({
+            text: "`" + reason.id + "`",
             id: "workbench.action.openSettings",
-            arguments: [reason.id]
+            arguments: [reason.id],
+            tooltip: ( localize(6912, "Open settings"))
         }, false)));
         break;
     case ToolConfirmKind.LmServicePerTool:
-        md = reason.scope === "session" ? ( localize(6707, "Auto approved for this session")) : reason.scope === "workspace" ? ( localize(6708, "Auto approved for this workspace")) : ( localize(6709, "Auto approved for this profile"));
+        md = reason.scope === "session" ? ( localize(6913, "Auto approved for this session")) : reason.scope === "workspace" ? ( localize(6914, "Auto approved for this workspace")) : ( localize(6915, "Auto approved for this profile"));
         md += " (" + createMarkdownCommandLink({
-            title: ( localize(6710, "Edit")),
+            text: ( localize(6916, "Edit")),
             id: "workbench.action.chat.editToolApproval",
-            arguments: [reason.scope]
+            arguments: [reason.scope],
+            tooltip: ( localize(6917, "Edit tool approval settings"))
         }) + ")";
         break;
     case ToolConfirmKind.ConfirmationNotNeeded:
@@ -45,4 +59,4 @@ function getApprovalMessageFromReason(reason) {
     }));
 }
 
-export { getApprovalMessageFromReason, getToolApprovalMessage };
+export { getApprovalMessageFromReason, getToolApprovalMessage, 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(6711, "Allow Once")),
-            skipLabel: ( localize(6712, "Skip Results")),
+            allowLabel: ( localize(6918, "Allow Once")),
+            skipLabel: ( localize(6919, "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(6713, "Approve Tool Result");
+        return localize(6920, "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(6714, "No results to display"));
+            container.textContent = ( localize(6921, "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(6715, "No displayable results"));
+        container.textContent = ( localize(6922, "No displayable results"));
         return container;
     }
 };

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

@@ -12,6 +12,7 @@ import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-a
 import { AccessibilityWorkbenchSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ChatProgressContentPart } from '../chatProgressContentPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { shouldShimmerForTool } from './chatToolPartUtilities.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let ChatToolProgressSubPart = class ChatToolProgressSubPart extends BaseChatToolInvocationSubPart {
@@ -31,16 +32,6 @@ let ChatToolProgressSubPart = class ChatToolProgressSubPart extends BaseChatTool
         this.configurationService = configurationService;
         this.codeblocks = [];
         this.domNode = this.createProgressPart();
-        const updateCheckmarks = () => this.domNode.classList.toggle(
-            "show-checkmarks",
-            !!this.configurationService.getValue(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)
-        );
-        updateCheckmarks();
-        this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
-                updateCheckmarks();
-            }
-        }));
     }
     createProgressPart() {
         const isComplete = IChatToolInvocation.isComplete(this.toolInvocation);
@@ -98,7 +89,6 @@ let ChatToolProgressSubPart = class ChatToolProgressSubPart extends BaseChatTool
         if (shouldAnnounce) {
             this.provideScreenReaderStatus(content);
         }
-        const isAskQuestionsTool = this.toolInvocation.toolId === "copilot_askQuestions" || this.toolInvocation.toolId === "vscode_askQuestions";
         return this.instantiationService.createInstance(
             ChatProgressContentPart,
             progressMessage,
@@ -108,7 +98,7 @@ let ChatToolProgressSubPart = class ChatToolProgressSubPart extends BaseChatTool
             true,
             this.getIcon(),
             this.toolInvocation,
-            isAskQuestionsTool ? undefined : false
+            shouldShimmerForTool(this.toolInvocation)
         );
     }
     getAnnouncementKey(kind) {

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

@@ -180,7 +180,7 @@ let ChatDragAndDrop = class ChatDragAndDrop extends Themable {
         } else if (containsDragType(e, CodeDataTransfers.SCM_HISTORY_ITEM)) {
             return ChatDragAndDropType.SCM_HISTORY_ITEM;
         } else if (containsImageDragType(e)) {
-            return ( this.extensionService.extensions.some(ext => isProposedApiEnabled(ext, "chatReferenceBinaryData"))) ? ChatDragAndDropType.IMAGE : undefined;
+            return ( this.extensionService.extensions.some(ext => isProposedApiEnabled(ext))) ? ChatDragAndDropType.IMAGE : undefined;
         } else if (containsDragType(e, "text/html")) {
             return ChatDragAndDropType.HTML;
         } else if (containsDragType(e, CodeDataTransfers.SYMBOLS)) {
@@ -209,23 +209,23 @@ let ChatDragAndDrop = class ChatDragAndDrop extends Themable {
     getDropTypeName(type) {
         switch (type) {
         case ChatDragAndDropType.FILE_INTERNAL:
-            return localize(6716, "File");
+            return localize(6923, "File");
         case ChatDragAndDropType.FILE_EXTERNAL:
-            return localize(6716, "File");
+            return localize(6923, "File");
         case ChatDragAndDropType.FOLDER:
-            return localize(6717, "Folder");
+            return localize(6924, "Folder");
         case ChatDragAndDropType.IMAGE:
-            return localize(6718, "Image");
+            return localize(6925, "Image");
         case ChatDragAndDropType.SYMBOL:
-            return localize(6719, "Symbol");
+            return localize(6926, "Symbol");
         case ChatDragAndDropType.MARKER:
-            return localize(6720, "Problem");
+            return localize(6927, "Problem");
         case ChatDragAndDropType.HTML:
-            return localize(6721, "URL");
+            return localize(6928, "URL");
         case ChatDragAndDropType.NOTEBOOK_CELL_OUTPUT:
-            return localize(6722, "Output");
+            return localize(6929, "Output");
         case ChatDragAndDropType.SCM_HISTORY_ITEM:
-            return localize(6723, "Change");
+            return localize(6930, "Change");
         }
     }
     async resolveAttachmentsFromDragEvent(e) {
@@ -297,7 +297,7 @@ let ChatDragAndDrop = class ChatDragAndDrop extends Themable {
     async resolveHTMLAttachContext(e) {
         const existingAttachmentNames = ( new Set(( this.attachmentModel.attachments.map(attachment => attachment.name))));
         const createDisplayName = () => {
-            const baseName = ( localize(6724, "Image from URL"));
+            const baseName = ( localize(6931, "Image from URL"));
             let uniqueName = baseName;
             let baseNameInstance = 1;
             while (( existingAttachmentNames.has(uniqueName))) {
@@ -375,7 +375,7 @@ let ChatDragAndDrop = class ChatDragAndDrop extends Themable {
     }
     getOverlayText(type) {
         const typeName = this.getDropTypeName(type);
-        return localize(6725, "Attach {0} as Context", typeName);
+        return localize(6932, "Attach {0} as Context", typeName);
     }
     updateOverlayStyles(overlay) {
         overlay.style.backgroundColor = this.getColor(this.styles.overlayBackground) || "";