@codingame/monaco-vscode-katex-common 34.1.3 → 35.0.0

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

@@ -1,7 +1,7 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { h, addDisposableListener, EventType, DisposableResizeObserver, clearNode, getActiveWindow, getComputedStyle, createTextNode, createElement, $, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+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';
@@ -333,7 +333,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const markdownOptions = {
             codeBlockRenderOptions,
             accessibilityOptions: pastTenseMessage ? {
-                statusMessage: ( localize(7555, "{0}", stripIcons(pastTenseMessage)))
+                statusMessage: ( localize(8107, "{0}", stripIcons(pastTenseMessage)))
             } : undefined
         };
         this.markdownPart = this._register(_instantiationService.createInstance(
@@ -436,6 +436,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const wrapper = this._register(this._instantiationService.createInstance(
             ChatTerminalThinkingCollapsibleWrapper,
             truncatedCommand,
+            this._terminalData.intention,
             this._terminalData.commandLine.isSandboxWrapped === true,
             contentElement,
             context,
@@ -551,12 +552,12 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         this._actionBarActions.clear();
         const actions = [];
         if (this._toolbarCanContinueInBackground) {
-            const action = ( new Action(TerminalContribCommandId.ContinueInBackground, ( localize(7556, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true, () => this.continueInBackground()));
+            const action = ( new Action(TerminalContribCommandId.ContinueInBackground, ( localize(8108, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinueSmall), true, () => this.continueInBackground()));
             this._actionBarActions.add(action);
             actions.push(action);
         }
         if (this._toolbarHasInstance) {
-            const focusLabel = this._toolbarIsHiddenTerminal ? ( localize(7557, "Show and Focus Terminal")) : ( localize(7558, "Focus Terminal"));
+            const focusLabel = this._toolbarIsHiddenTerminal ? ( localize(8109, "Show and Focus Terminal")) : ( localize(8110, "Focus Terminal"));
             const action = ( new Action(
                 TerminalContribCommandId.FocusChatInstanceAction,
                 focusLabel,
@@ -569,7 +570,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(7559, "Hide Output")) : ( localize(7560, "Show Output"));
+            const toggleLabel = this._toolbarOutputExpanded ? ( localize(8111, "Hide Output")) : ( localize(8112, "Show Output"));
             const action = ( new Action(
                 TerminalContribCommandId.ToggleChatTerminalOutput,
                 toggleLabel,
@@ -1016,7 +1017,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return;
         }
-        const ariaLabel = ( localize(7561, "Terminal output for {0}", commandText));
+        const ariaLabel = ( localize(8113, "Terminal output for {0}", commandText));
         const scrollableDomNode = this._scrollableContainer.getDomNode();
         scrollableDomNode.setAttribute("role", "region");
         const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.TerminalChatOutput);
@@ -1029,26 +1030,26 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return undefined;
         }
-        const commandHeader = ( localize(7562, "Command: {0}", commandText));
+        const commandHeader = ( localize(8114, "Command: {0}", commandText));
         if (command) {
             const rawOutput = command.getOutput();
             if (!rawOutput || rawOutput.trim().length === 0) {
-                return `${commandHeader}\n${( localize(7563, "No output was produced by the command."))}`;
+                return `${commandHeader}\n${( localize(8115, "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(7564, "Command output is no longer available."))}`;
+            return `${commandHeader}\n${( localize(8116, "Command output is no longer available."))}`;
         }
         const plain = removeAnsiEscapeCodes((snapshot.text ?? ""));
         if (!plain.trim().length) {
-            return `${commandHeader}\n${( localize(7563, "No output was produced by the command."))}`;
+            return `${commandHeader}\n${( localize(8115, "No output was produced by the command."))}`;
         }
         let outputText = plain.trimEnd();
         if (snapshot.truncated) {
-            outputText += `\n${( localize(7565, "Output truncated."))}`;
+            outputText += `\n${( localize(8117, "Output truncated."))}`;
         }
         return `${commandHeader}\n${outputText}`;
     }
@@ -1160,7 +1161,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         }
         if (!hasOutput) {
             if (commandFinished) {
-                this._showEmptyMessage(( localize(7563, "No output was produced by the command.")));
+                this._showEmptyMessage(( localize(8115, "No output was produced by the command.")));
             }
         } else {
             this._hideEmptyMessage();
@@ -1187,7 +1188,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (hasText) {
             this._hideEmptyMessage();
         } else {
-            this._showEmptyMessage(( localize(7563, "No output was produced by the command.")));
+            this._showEmptyMessage(( localize(8115, "No output was produced by the command.")));
         }
         const lineCount = result?.lineCount ?? snapshot.lineCount ?? 0;
         this._layoutOutput(lineCount);
@@ -1196,9 +1197,9 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         clearNode(this._terminalContainer);
         this._lastRenderedLineCount = undefined;
         if (!liveTerminalInstance) {
-            this._showEmptyMessage(( localize(7566, "Terminal is no longer available.")));
+            this._showEmptyMessage(( localize(8118, "Terminal is no longer available.")));
         } else {
-            this._showEmptyMessage(( localize(7567, "Command information is not available.")));
+            this._showEmptyMessage(( localize(8119, "Command information is not available.")));
         }
     }
     async _resolveLiveTerminal() {
@@ -1314,6 +1315,7 @@ ChatTerminalToolOutputSection = ( __decorate([( __param(6, IAccessibleViewServic
 let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsibleWrapper extends ChatCollapsibleContentPart {
     constructor(
         commandText,
+        intention,
         isSandboxWrapped,
         contentElement,
         context,
@@ -1325,11 +1327,14 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         hoverService,
         configurationService
     ) {
-        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));
+        const intentionText = intention && !isSkipped ? intention : undefined;
+        const stateTitle = isSkipped ? ( localize(8120, "Skipped {0}", commandText)) : isRunningInBackground ? ( localize(8121, "Running {0} in background", commandText)) : isComplete ? ( localize(8122, "Ran {0}", commandText)) : ( localize(8123, "Running {0}", commandText));
+        const title = intentionText ? isRunningInBackground ? `${intentionText} ${commandText}${( localize(8124, " in background"))}` : `${intentionText} ${commandText}` : stateTitle;
         super(title, context, undefined, hoverService, configurationService);
         this._showLinkDisposables = this._register(( new MutableDisposable()));
         this._terminalContentElement = contentElement;
         this._commandText = commandText;
+        this._intention = intentionText;
         this._isSandboxWrapped = isSandboxWrapped;
         this._isComplete = isComplete;
         this._isSkipped = isSkipped;
@@ -1349,24 +1354,31 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         }
         const labelElement = this._collapseButton.labelElement;
         labelElement.textContent = "";
-        if (this._isSandboxWrapped) {
-            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");
+        const suffixText = this._isSandboxWrapped ? this._isRunningInBackground ? ( localize(8125, " in sandbox (background)")) : ( localize(8126, " in sandbox")) : this._isRunningInBackground ? ( localize(8124, " in background")) : undefined;
+        this.domNode.classList.toggle("chat-terminal-has-intention", !!this._intention);
+        if (this._intention) {
+            const row = $("span.chat-terminal-label-flex");
+            const intentionElement = $("span.chat-terminal-intention");
+            intentionElement.textContent = this._intention;
+            const codeElement = $("code.chat-terminal-command");
             codeElement.textContent = this._commandText;
-            labelElement.appendChild(codeElement);
-            labelElement.appendChild(createTextNode(suffixText));
+            row.appendChild(intentionElement);
+            row.appendChild(codeElement);
+            if (suffixText) {
+                const suffixElement = $("span.chat-terminal-label-suffix");
+                suffixElement.textContent = suffixText;
+                row.appendChild(suffixElement);
+            }
+            labelElement.appendChild(row);
             return;
         }
-        const prefixText = this._isSkipped ? ( localize(7577, "Skipped ")) : this._isComplete ? ( localize(7578, "Ran ")) : ( localize(7579, "Running "));
-        const ranText = createTextNode(prefixText);
+        const prefixText = this._isSandboxWrapped ? this._isSkipped ? ( localize(8127, "Skipped ")) : this._isComplete ? ( localize(8128, "Ran ")) : ( localize(8129, "Running ")) : this._isSkipped ? ( localize(8130, "Skipped ")) : this._isComplete ? ( localize(8131, "Ran ")) : ( localize(8132, "Running "));
+        labelElement.appendChild(createTextNode(prefixText));
         const codeElement = createElement("code");
         codeElement.textContent = this._commandText;
-        labelElement.appendChild(ranText);
         labelElement.appendChild(codeElement);
         if (this._isRunningInBackground) {
-            labelElement.appendChild(createTextNode(( localize(7580, " in background"))));
+            labelElement.appendChild(createTextNode(( localize(8124, " in background"))));
         }
     }
     _updateShowLink() {
@@ -1382,7 +1394,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(7581, "Show"));
+        showLink.textContent = ( localize(8133, "Show"));
         showLink.role = "button";
         showLink.tabIndex = 0;
         store.add(addDisposableListener(showLink, EventType.CLICK, e => {
@@ -1422,6 +1434,6 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         return false;
     }
 };
-ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(9, IHoverService)), ( __param(10, IConfigurationService))], ChatTerminalThinkingCollapsibleWrapper));
+ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(10, IHoverService)), ( __param(11, IConfigurationService))], ChatTerminalThinkingCollapsibleWrapper));
 
 export { ChatTerminalThinkingCollapsibleWrapper, ChatTerminalToolProgressPart };

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(7582, "Tool confirmation carousel")));
+        this.domNode.setAttribute("aria-label", ( localize(8134, "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(7583, "Allow All"));
+        this.allowAllButton.label = ( localize(8135, "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(7584, "Skip")) : ( localize(7585, "Skip All"));
+        const dismissButtonLabel = this.items.length === 1 ? ( localize(8136, "Skip")) : ( localize(8137, "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(7586, "Previous")));
+        this.prevButton.element.setAttribute("aria-label", ( localize(8138, "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(7587, "Next")));
+        this.nextButton.element.setAttribute("aria-label", ( localize(8139, "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(7588, "Scroll to {0}", item.agentName));
+            this.agentLabel.title = ( localize(8140, "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(7583, "Allow All")) : ( localize(7589, "Allow"));
+        this.allowAllButton.label = multi ? ( localize(8135, "Allow All")) : ( localize(8141, "Allow"));
         this.updateExpandContentButton();
     }
     renderActiveContent() {
@@ -381,7 +381,7 @@ class ChatToolConfirmationCarouselPart extends Disposable {
     }
     updateExpandContentButton() {
         const expanded = this.canExpandContent && this._isContentExpanded;
-        const label = expanded ? ( localize(7590, "Restore Confirmation Size")) : ( localize(7591, "Expand Confirmation Up"));
+        const label = expanded ? ( localize(8142, "Restore Confirmation Size")) : ( localize(8143, "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.d.ts

@@ -11,6 +11,7 @@ import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/
 import { ILanguageModelToolsConfirmationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service";
 import { IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { IChatToolRiskAssessmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService.service";
 import { IChatContentPartRenderContext } from "../chatContentParts.js";
 import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service";
 import { AbstractToolConfirmationSubPart } from "./abstractToolConfirmationSubPart.js";
@@ -27,7 +28,7 @@ export declare class ToolConfirmationSubPart extends AbstractToolConfirmationSub
     private readonly confirmationService;
     private markdownParts;
     get codeblocks(): IChatCodeBlockInfo[];
-    constructor(toolInvocation: IChatToolInvocation, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockStartIndex: number, instantiationService: IInstantiationService, keybindingService: IKeybindingService, languageService: ILanguageService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, commandService: ICommandService, markerService: IMarkerService, languageModelToolsService: ILanguageModelToolsService, chatMarkdownAnchorService: IChatMarkdownAnchorService, confirmationService: ILanguageModelToolsConfirmationService);
+    constructor(toolInvocation: IChatToolInvocation, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockStartIndex: number, instantiationService: IInstantiationService, keybindingService: IKeybindingService, languageService: ILanguageService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, commandService: ICommandService, markerService: IMarkerService, languageModelToolsService: ILanguageModelToolsService, chatMarkdownAnchorService: IChatMarkdownAnchorService, confirmationService: ILanguageModelToolsConfirmationService, riskAssessmentService: IChatToolRiskAssessmentService);
     protected additionalPrimaryActions(): (Separator | import("./abstractToolConfirmationSubPart.js").IAbstractToolPrimaryAction)[];
     protected useAllowOnceAsPrimary(): boolean;
     protected createContentElement(): HTMLElement | string;

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

@@ -23,6 +23,7 @@ import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/
 import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service';
 import { SkipToolConfirmationActionId, AcceptToolConfirmationActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { IChatToolRiskAssessmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService.service';
 import { renderFileWidgets } from '../chatInlineAnchorWidget.js';
 import { CodeBlockPart } from '../codeBlockPart.js';
 import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
@@ -50,7 +51,8 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         markerService,
         languageModelToolsService,
         chatMarkdownAnchorService,
-        confirmationService
+        confirmationService,
+        riskAssessmentService
     ) {
         const state = toolInvocation.state.get();
         if (state.type !== IChatToolInvocation.StateKind.WaitingForConfirmation || !state.confirmationMessages?.title) {
@@ -63,7 +65,8 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
             keybindingService,
             contextKeyService,
             chatWidgetService,
-            languageModelToolsService
+            languageModelToolsService,
+            riskAssessmentService
         );
         this.renderer = renderer;
         this.editorPool = editorPool;
@@ -78,8 +81,8 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         this.render({
             allowActionId: AcceptToolConfirmationActionId,
             skipActionId: SkipToolConfirmationActionId,
-            allowLabel: state.confirmationMessages.confirmResults ? ( localize(7592, "Allow and Review Once")) : ( localize(7593, "Allow Once")),
-            skipLabel: ( localize(7594, "Proceed without running this tool")),
+            allowLabel: state.confirmationMessages.confirmResults ? ( localize(8144, "Allow and Review Once")) : ( localize(8145, "Allow Once")),
+            skipLabel: ( localize(8146, "Proceed without running this tool")),
             partType: "chatToolConfirmation",
             subtitle: typeof toolInvocation.originMessage === "string" ? toolInvocation.originMessage : toolInvocation.originMessage?.value
         });
@@ -125,7 +128,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         }
         if (state.confirmationMessages?.confirmResults) {
             actions.unshift({
-                label: ( localize(7595, "Allow and Skip Reviewing Result")),
+                label: ( localize(8147, "Allow and Skip Reviewing Result")),
                 data: () => {
                     state.confirmationMessages.confirmResults = undefined;
                     this.confirmWith(this.toolInvocation, {
@@ -167,11 +170,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(7596, "Show More"))])])
+                h(".see-more@showMore", [h("a", [( localize(8148, "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(7597, "Input"));
+                titleEl.textContent = ( localize(8149, "Input"));
                 elements.editor.appendChild(titleEl);
                 const inputData = toolInvocation.toolSpecificData;
                 const codeBlockRenderOptions = {
@@ -241,7 +244,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(7598, "See more"));
+                    seeMore.link.textContent = ( localize(8150, "See more"));
                     this._register(addDisposableGenericMouseDownListener(seeMore.link, () => {
                         try {
                             const parsed = JSON.parse(model.getValue());
@@ -308,6 +311,6 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         return part;
     }
 };
-ToolConfirmationSubPart = ( __decorate([( __param(6, IInstantiationService)), ( __param(7, IKeybindingService)), ( __param(8, ILanguageService)), ( __param(9, IContextKeyService)), ( __param(10, IChatWidgetService)), ( __param(11, ICommandService)), ( __param(12, IMarkerService)), ( __param(13, ILanguageModelToolsService)), ( __param(14, IChatMarkdownAnchorService)), ( __param(15, ILanguageModelToolsConfirmationService))], ToolConfirmationSubPart));
+ToolConfirmationSubPart = ( __decorate([( __param(6, IInstantiationService)), ( __param(7, IKeybindingService)), ( __param(8, ILanguageService)), ( __param(9, IContextKeyService)), ( __param(10, IChatWidgetService)), ( __param(11, ICommandService)), ( __param(12, IMarkerService)), ( __param(13, ILanguageModelToolsService)), ( __param(14, IChatMarkdownAnchorService)), ( __param(15, ILanguageModelToolsConfirmationService)), ( __param(16, IChatToolRiskAssessmentService))], ToolConfirmationSubPart));
 
 export { ToolConfirmationSubPart };

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

@@ -24,7 +24,7 @@ export declare class ChatToolInvocationPart extends Disposable implements IChatC
     get codeblocks(): IChatCodeBlockInfo[];
     get codeblocksPartId(): string | undefined;
     private subPart;
-    private mcpAppPart;
+    private readonly mcpAppPart;
     private readonly _onDidRemount;
     constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, listPool: CollapsibleListPool, editorPool: EditorPool, currentWidthDelegate: () => number, announcedToolProgressKeys: Set<string> | undefined, codeBlockStartIndex: number, instantiationService: IInstantiationService, chatTodoListService: IChatTodoListService);
     private createToolInvocationSubPart;

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

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { $, createElement, hide, show, clearNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-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 '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IChatToolInvocation, ToolConfirmKind, isLegacyChatTerminalToolInvocationData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
@@ -13,8 +13,9 @@ import { ChatInputOutputMarkdownProgressPart } from './chatInputOutputMarkdownPr
 import { ChatMcpAppSubPart } from './chatMcpAppSubPart.js';
 import { ChatResultListSubPart } from './chatResultListSubPart.js';
 import { ChatSimpleToolProgressPart } from './chatSimpleToolProgressPart.js';
-import { ChatMissingSandboxDepsConfirmationSubPart } from './chatMissingSandboxDepsConfirmationSubPart.js';
+import { ChatSandboxPrerequisiteConfirmationSubPart } from './chatSandboxPrerequisiteConfirmationSubPart.js';
 import { ChatModifiedFilesConfirmationSubPart } from './chatModifiedFilesConfirmationSubPart.js';
+import { ChatAgentFeedbackReviewConfirmationSubPart } from './chatAgentFeedbackReviewConfirmationSubPart.js';
 import { ChatTerminalToolConfirmationSubPart } from './chatTerminalToolConfirmationSubPart.js';
 import { ChatTerminalToolProgressPart } from './chatTerminalToolProgressPart.js';
 import { ToolConfirmationSubPart } from './chatToolConfirmationSubPart.js';
@@ -23,7 +24,7 @@ import { ChatToolPostExecuteConfirmationPart } from './chatToolPostExecuteConfir
 import { ChatToolProgressSubPart } from './chatToolProgressPart.js';
 import { ChatToolStreamingSubPart } from './chatToolStreamingSubPart.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
-import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 
 let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
     get toolCallId() {
@@ -32,7 +33,7 @@ let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
     get codeblocks() {
         const codeblocks = this.subPart?.codeblocks ?? [];
         if (this.mcpAppPart) {
-            codeblocks.push(...this.mcpAppPart.codeblocks);
+            codeblocks.push(...(this.mcpAppPart.value?.codeblocks ?? []));
         }
         return codeblocks;
     }
@@ -62,6 +63,7 @@ let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
         this.codeBlockStartIndex = codeBlockStartIndex;
         this.instantiationService = instantiationService;
         this.chatTodoListService = chatTodoListService;
+        this.mcpAppPart = this._register(( new MutableDisposable()));
         this._onDidRemount = this._register(( new Emitter()));
         this.domNode = $(".chat-tool-invocation-part");
         if (toolInvocation.presentation === "hidden") {
@@ -80,6 +82,7 @@ let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
             }));
             this.chatTodoListService.setTodos(sessionResource, todos);
         }
+        let appData = constObservable(undefined);
         if (toolInvocation.kind === "toolInvocation") {
             const initialState = toolInvocation.state.get().type;
             const initialDataKind = toolInvocation.toolSpecificDataKind.get();
@@ -90,6 +93,13 @@ let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
                     render();
                 }
             }));
+            appData = ( ( toolInvocation.toolSpecificDataKind.map(() => this.getMcpAppRenderData())).map((data, reader) => {
+                if (!data) {
+                    return undefined;
+                }
+                const outcome = IChatToolInvocation.executionConfirmedOrDenied(toolInvocation, reader);
+                return !!outcome && outcome.type !== ToolConfirmKind.Denied && outcome.type !== ToolConfirmKind.Skipped ? data : undefined;
+            }));
         }
         const partStore = this._register(( new DisposableStore()));
         let subPartDomNode = createElement("div");
@@ -104,35 +114,29 @@ 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 ChatModifiedFilesConfirmationSubPart || this.subPart instanceof ChatMissingSandboxDepsConfirmationSubPart || 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 ChatSandboxPrerequisiteConfirmationSubPart || this.subPart instanceof ExtensionsInstallConfirmationWidgetSubPart || this.subPart instanceof ChatToolPostExecuteConfirmationPart;
             this.domNode.classList.toggle("has-confirmation", isConfirmation);
             partStore.add(this.subPart.onNeedsRerender(render));
         };
-        const mcpAppRenderData = this.getMcpAppRenderData();
-        if (mcpAppRenderData) {
-            const shouldRender = derived(r => {
-                const outcome = IChatToolInvocation.executionConfirmedOrDenied(toolInvocation, r);
-                return !!outcome && outcome.type !== ToolConfirmKind.Denied && outcome.type !== ToolConfirmKind.Skipped;
-            });
-            let appDomNode = createElement("div");
-            this.domNode.appendChild(appDomNode);
-            this._register(autorun(r => {
-                if (shouldRender.read(r)) {
-                    this.mcpAppPart = r.store.add(this.instantiationService.createInstance(
-                        ChatMcpAppSubPart,
-                        this.toolInvocation,
-                        this._onDidRemount.event,
-                        context,
-                        mcpAppRenderData
-                    ));
-                    appDomNode.replaceWith(this.mcpAppPart.domNode);
-                    appDomNode = this.mcpAppPart.domNode;
-                } else {
-                    this.mcpAppPart = undefined;
-                    clearNode(appDomNode);
-                }
-            }));
-        }
+        let appDomNode = createElement("div");
+        this.domNode.appendChild(appDomNode);
+        this._register(autorun(r => {
+            const data = appData.read(r);
+            if (!data) {
+                this.mcpAppPart.clear();
+                clearNode(appDomNode);
+                return;
+            }
+            this.mcpAppPart.value = this.instantiationService.createInstance(
+                ChatMcpAppSubPart,
+                this.toolInvocation,
+                this._onDidRemount.event,
+                context,
+                data
+            );
+            appDomNode.replaceWith(this.mcpAppPart.value.domNode);
+            appDomNode = this.mcpAppPart.value.domNode;
+        }));
         render();
     }
     createToolInvocationSubPart() {
@@ -149,9 +153,9 @@ let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
                 return this.instantiationService.createInstance(ChatToolStreamingSubPart, this.toolInvocation, this.context, this.renderer);
             }
             if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
-                if (this.toolInvocation.toolSpecificData?.kind === "terminal" && !isLegacyChatTerminalToolInvocationData(this.toolInvocation.toolSpecificData) && this.toolInvocation.toolSpecificData.missingSandboxDependencies?.length) {
+                if (this.toolInvocation.toolSpecificData?.kind === "terminal" && !isLegacyChatTerminalToolInvocationData(this.toolInvocation.toolSpecificData) && (this.toolInvocation.toolSpecificData.missingSandboxDependencies?.length || this.toolInvocation.toolSpecificData.sandboxRemediations?.length)) {
                     return this.instantiationService.createInstance(
-                        ChatMissingSandboxDepsConfirmationSubPart,
+                        ChatSandboxPrerequisiteConfirmationSubPart,
                         this.toolInvocation,
                         this.toolInvocation.toolSpecificData,
                         this.context,
@@ -175,6 +179,12 @@ let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
                         this.context,
                         this.listPool
                     );
+                } else if (this.toolInvocation.toolSpecificData?.kind === "agentFeedbackReviewConfirmation") {
+                    return this.instantiationService.createInstance(
+                        ChatAgentFeedbackReviewConfirmationSubPart,
+                        this.toolInvocation,
+                        this.context
+                    );
                 } else {
                     return this.instantiationService.createInstance(
                         ToolConfirmationSubPart,
@@ -285,9 +295,7 @@ let ChatToolInvocationPart = class ChatToolInvocationPart extends Disposable {
         if (toolSpecificData?.kind === "input" && toolSpecificData.mcpAppData) {
             const rawInput = typeof toolSpecificData.rawInput === "string" ? toolSpecificData.rawInput : JSON.stringify(toolSpecificData.rawInput, null, 2);
             return {
-                resourceUri: toolSpecificData.mcpAppData.resourceUri,
-                serverDefinitionId: toolSpecificData.mcpAppData.serverDefinitionId,
-                collectionId: toolSpecificData.mcpAppData.collectionId,
+                ...toolSpecificData.mcpAppData,
                 input: rawInput,
                 sessionResource: this.context.element.sessionResource
             };

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(7599, "Rendering tool output..."));
+        progressMessage.textContent = ( localize(8151, "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(7600, "Error rendering the tool output"));
+            errorTitleNode.textContent = ( localize(8152, "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.js

@@ -29,20 +29,20 @@ function getApprovalMessageFromReason(reason) {
     let md;
     switch (reason.type) {
     case ToolConfirmKind.Setting:
-        md = ( localize(7601, "Auto approved by {0}", createMarkdownCommandLink({
+        md = ( localize(8153, "Auto approved by {0}", createMarkdownCommandLink({
             text: "`" + reason.id + "`",
             id: "workbench.action.openSettings",
             arguments: [reason.id],
-            tooltip: ( localize(7602, "Open settings"))
+            tooltip: ( localize(8154, "Open settings"))
         }, false)));
         break;
     case ToolConfirmKind.LmServicePerTool:
-        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 = reason.scope === "session" ? ( localize(8155, "Auto approved for this session")) : reason.scope === "workspace" ? ( localize(8156, "Auto approved for this workspace")) : ( localize(8157, "Auto approved for this profile"));
         md += " (" + createMarkdownCommandLink({
-            text: ( localize(7606, "Edit")),
+            text: ( localize(8158, "Edit")),
             id: "workbench.action.chat.editToolApproval",
             arguments: [reason.scope],
-            tooltip: ( localize(7607, "Edit tool approval settings"))
+            tooltip: ( localize(8159, "Edit tool approval settings"))
         }) + ")";
         break;
     case ToolConfirmKind.ConfirmationNotNeeded:

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

@@ -7,13 +7,14 @@ import { ILanguageModelToolsConfirmationService } from "@codingame/monaco-vscode
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { IChatToolRiskAssessmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService.service";
 import { IChatContentPartRenderContext } from "../chatContentParts.js";
 import { AbstractToolConfirmationSubPart } from "./abstractToolConfirmationSubPart.js";
 export declare class ChatToolPostExecuteConfirmationPart extends AbstractToolConfirmationSubPart {
     private readonly confirmationService;
     private _codeblocks;
     get codeblocks(): IChatCodeBlockInfo[];
-    constructor(toolInvocation: IChatToolInvocation, context: IChatContentPartRenderContext, instantiationService: IInstantiationService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, languageModelToolsService: ILanguageModelToolsService, confirmationService: ILanguageModelToolsConfirmationService);
+    constructor(toolInvocation: IChatToolInvocation, context: IChatContentPartRenderContext, instantiationService: IInstantiationService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, languageModelToolsService: ILanguageModelToolsService, confirmationService: ILanguageModelToolsConfirmationService, riskAssessmentService: IChatToolRiskAssessmentService);
     protected createContentElement(): HTMLElement;
     protected getTitle(): string;
     protected additionalPrimaryActions(): (Separator | import("./abstractToolConfirmationSubPart.js").IAbstractToolPrimaryAction)[];