@codingame/monaco-vscode-katex-common 31.0.1 → 32.0.0

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

@@ -10,8 +10,10 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IPreferencesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service";
 import { ITerminalChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { IChatToolInvocation, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+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 { EditorPool } from "../chatContentCodePools.js";
 import { IChatContentPartRenderContext } from "../chatContentParts.js";
 import { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
@@ -54,10 +56,13 @@ export declare class ChatTerminalToolConfirmationSubPart extends BaseChatToolInv
     private readonly preferencesService;
     private readonly storageService;
     private readonly terminalChatService;
+    private readonly languageModelToolsService;
+    private readonly riskAssessmentService;
     readonly domNode: HTMLElement;
     readonly codeblocks: IChatCodeBlockInfo[];
-    constructor(toolInvocation: IChatToolInvocation, terminalData: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockStartIndex: number, instantiationService: IInstantiationService, dialogService: IDialogService, keybindingService: IKeybindingService, languageService: ILanguageService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, preferencesService: IPreferencesService, storageService: IStorageService, terminalChatService: ITerminalChatService, hoverService: IHoverService);
+    constructor(toolInvocation: IChatToolInvocation, terminalData: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockStartIndex: number, instantiationService: IInstantiationService, dialogService: IDialogService, keybindingService: IKeybindingService, languageService: ILanguageService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, preferencesService: IPreferencesService, storageService: IStorageService, terminalChatService: ITerminalChatService, hoverService: IHoverService, languageModelToolsService: ILanguageModelToolsService, riskAssessmentService: IChatToolRiskAssessmentService);
     private _createButtons;
     private _showAutoApproveWarning;
+    private _createRiskBadge;
     private _appendMarkdownPart;
 }

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

@@ -5,9 +5,10 @@ import { HoverStyle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { asArray } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ErrorNoTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { MarkdownString, createCommandUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { MarkdownString, escapeMarkdownSyntaxTokens, createCommandUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
@@ -28,12 +29,15 @@ import { TerminalContribSettingId, TerminalContribCommandId } from '@codingame/m
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { migrateLegacyTerminalToolSpecificData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
 import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { AcceptToolConfirmationActionId, SkipToolConfirmationActionId } 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 { ChatCustomConfirmationWidget } from '../chatConfirmationWidget.js';
 import { ChatMarkdownContentPart } from '../chatMarkdownContentPart.js';
 import { CodeBlockPart } from '../codeBlockPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { ToolRiskBadgeWidget } from './toolRiskBadgeWidget.js';
 
 var TerminalToolConfirmationStorageKeys;
 (function(TerminalToolConfirmationStorageKeys) {
@@ -60,7 +64,9 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
         preferencesService,
         storageService,
         terminalChatService,
-        hoverService
+        hoverService,
+        languageModelToolsService,
+        riskAssessmentService
     ) {
         super(toolInvocation);
         this.context = context;
@@ -78,6 +84,8 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
         this.preferencesService = preferencesService;
         this.storageService = storageService;
         this.terminalChatService = terminalChatService;
+        this.languageModelToolsService = languageModelToolsService;
+        this.riskAssessmentService = riskAssessmentService;
         this.codeblocks = [];
         const state = toolInvocation.state.get();
         if (state.type !== IChatToolInvocation.StateKind.WaitingForConfirmation || !state.confirmationMessages?.title) {
@@ -104,7 +112,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             moreActions = [];
             if (!autoApproveWarningAccepted) {
                 moreActions.push({
-                    label: ( localize(7039, "Enable Auto Approve...")),
+                    label: ( localize(7310, "Enable Auto Approve...")),
                     data: {
                         type: "enable"
                     }
@@ -179,33 +187,89 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                 hoverPosition: HoverPosition.LEFT
             }
         }));
+        const riskBadge = this._createRiskBadge(state.parameters);
         const confirmWidget = this._register(
             this.instantiationService.createInstance(ChatCustomConfirmationWidget, this.context, {
                 title,
                 icon: Codicon.terminal,
                 message: elements.root,
+                footerBanner: riskBadge?.domNode,
                 buttons: this._createButtons(moreActions)
             })
         );
+        const detailParts = [];
         if (terminalData.requestUnsandboxedExecution) {
             const reasonText = (terminalData.requestUnsandboxedExecutionReason && terminalData.requestUnsandboxedExecutionReason.trim()) || ( localize(
-                7040,
+                7311,
                 "The model did not provide a reason for requesting unsandboxed execution."
             ));
-            const unsandboxedReasonMarkdown = ( new MarkdownString(undefined, {
+            const inline = ( new MarkdownString(undefined, {
                 supportThemeIcons: true
             }));
-            unsandboxedReasonMarkdown.appendMarkdown(`$(${Codicon.info.id}) `);
-            unsandboxedReasonMarkdown.appendText(reasonText);
-            this._appendMarkdownPart(elements.disclaimer, unsandboxedReasonMarkdown, codeBlockRenderOptions);
+            inline.appendMarkdown(`$(${Codicon.info.id}) `);
+            inline.appendText(reasonText);
+            detailParts.push({
+                inline,
+                hoverLabel: ( localize(7312, "Sandbox insufficient:")),
+                hoverBody: escapeMarkdownSyntaxTokens(reasonText),
+                isTrusted: undefined
+            });
         }
         if (disclaimer) {
-            this._appendMarkdownPart(elements.disclaimer, disclaimer, codeBlockRenderOptions);
+            const inline = typeof disclaimer === "string" ? ( new MarkdownString(disclaimer)) : disclaimer;
+            const hoverBody = inline.value.replace(/^\s*\$\([^)]+\)\s*/, "");
+            detailParts.push({
+                inline,
+                hoverLabel: ( localize(7313, "Approval needed:")),
+                hoverBody,
+                isTrusted: inline.isTrusted
+            });
+        }
+        const renderInlineDisclaimers = () => {
+            elements.disclaimer.replaceChildren();
+            for (const part of detailParts) {
+                this._appendMarkdownPart(elements.disclaimer, part.inline, codeBlockRenderOptions);
+            }
+        };
+        if (riskBadge && detailParts.length) {
+            const combined = ( new MarkdownString(undefined, {
+                supportThemeIcons: true,
+                isTrusted: detailParts.reduce((acc, part) => {
+                    if (part.isTrusted === true || acc === true) {
+                        return true;
+                    }
+                    if (typeof part.isTrusted === "object" && part.isTrusted) {
+                        const enabled = ( new Set([
+                            ...(typeof acc === "object" && acc?.enabledCommands ? acc.enabledCommands : []),
+                            ...part.isTrusted.enabledCommands
+                        ]));
+                        return {
+                            enabledCommands: [...enabled]
+                        };
+                    }
+                    return acc;
+                }, undefined)
+            }));
+            detailParts.forEach((part, i) => {
+                if (i > 0) {
+                    combined.appendMarkdown("\n\n");
+                }
+                combined.appendMarkdown(`**${escapeMarkdownSyntaxTokens(part.hoverLabel)}** ${part.hoverBody}`);
+            });
+            riskBadge.setDetails(combined);
+            this._register(riskBadge.onDidHide(() => renderInlineDisclaimers()));
+        } else {
+            renderInlineDisclaimers();
         }
         const hasToolConfirmationKey = ChatContextKeys.Editing.hasToolConfirmation.bindTo(this.contextKeyService);
         hasToolConfirmationKey.set(true);
         this._register(toDisposable(() => hasToolConfirmationKey.reset()));
-        this._register(confirmWidget.onDidClick(async button => {
+        this._register(confirmWidget.onDidClick(async (
+            {
+                button,
+                isTouchClick
+            }
+        ) => {
             let doComplete = true;
             const data = button.data;
             let toolConfirmKind = ToolConfirmKind.Denied;
@@ -315,7 +379,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                                 }
                                 const target = scope === "workspace" ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
                                 const settingsUri = createCommandUri(TerminalContribCommandId.OpenTerminalSettingsLink, target);
-                                return `[\`${e.key}\`](${( settingsUri.toString())} "${( localize(7041, "View rule in settings"))}")`;
+                                return `[\`${e.key}\`](${( settingsUri.toString())} "${( localize(7314, "View rule in settings"))}")`;
                             })).join(", ");
                         }
                         const mdTrustSettings = {
@@ -326,33 +390,33 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                         const parts = [];
                         if (sessionRules.length > 0) {
                             parts.push(sessionRules.length === 1 ? ( localize(
-                                7042,
+                                7315,
                                 "Session auto approve rule {0} added",
                                 formatRuleLinks(sessionRules, "session")
                             )) : ( localize(
-                                7043,
+                                7316,
                                 "Session auto approve rules {0} added",
                                 formatRuleLinks(sessionRules, "session")
                             )));
                         }
                         if (workspaceRules.length > 0) {
                             parts.push(workspaceRules.length === 1 ? ( localize(
-                                7044,
+                                7317,
                                 "Workspace auto approve rule {0} added",
                                 formatRuleLinks(workspaceRules, "workspace")
                             )) : ( localize(
-                                7045,
+                                7318,
                                 "Workspace auto approve rules {0} added",
                                 formatRuleLinks(workspaceRules, "workspace")
                             )));
                         }
                         if (userRules.length > 0) {
                             parts.push(userRules.length === 1 ? ( localize(
-                                7046,
+                                7319,
                                 "User auto approve rule {0} added",
                                 formatRuleLinks(userRules, "user")
                             )) : ( localize(
-                                7047,
+                                7320,
                                 "User auto approve rules {0} added",
                                 formatRuleLinks(userRules, "user")
                             )));
@@ -382,7 +446,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                                 enabledCommands: [TerminalContribCommandId.DisableSessionAutoApproval]
                             }
                         };
-                        terminalData.autoApproveInfo = ( new MarkdownString(`${( localize(7048, "All commands will be auto approved for this session"))} ([${( localize(7049, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings));
+                        terminalData.autoApproveInfo = ( new MarkdownString(`${( localize(7321, "All commands will be auto approved for this session"))} ([${( localize(7322, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings));
                         toolConfirmKind = ToolConfirmKind.UserAction;
                         break;
                     }
@@ -392,7 +456,9 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                 IChatToolInvocation.confirmWith(toolInvocation, {
                     type: toolConfirmKind
                 });
-                this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.focusInput();
+                if (!isTouchClick) {
+                    this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.focusInput();
+                }
             }
         }));
         this.domNode = confirmWidget.domNode;
@@ -406,11 +472,11 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             };
         };
         return [{
-            ...getLabelAndTooltip(( localize(7050, "Allow")), AcceptToolConfirmationActionId),
+            ...getLabelAndTooltip(( localize(7323, "Allow")), AcceptToolConfirmationActionId),
             data: true,
             moreActions
         }, {
-            ...getLabelAndTooltip(( localize(7051, "Skip")), SkipToolConfirmationActionId, ( localize(7052, "Proceed without executing this command"))),
+            ...getLabelAndTooltip(( localize(7324, "Skip")), SkipToolConfirmationActionId, ( localize(7325, "Proceed without executing this command"))),
             data: {
                 type: "skip"
             },
@@ -420,9 +486,9 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
     async _showAutoApproveWarning() {
         const promptResult = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(7053, "Enable terminal auto approve?")),
+            message: ( localize(7326, "Enable terminal auto approve?")),
             buttons: [{
-                label: ( localize(7054, "Enable")),
+                label: ( localize(7327, "Enable")),
                 run: () => true
             }],
             cancelButton: true,
@@ -430,16 +496,49 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                 icon: Codicon.shield,
                 markdownDetails: [{
                     markdown: ( new MarkdownString(( localize(
-                        7055,
+                        7328,
                         "This will enable a configurable subset of commands to run in the terminal autonomously. It provides *best effort protections* and assumes the agent is not acting maliciously."
                     ))))
                 }, {
-                    markdown: ( new MarkdownString(`[${( localize(7056, "Learn more about the potential risks and how to avoid them."))}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`))
+                    markdown: ( new MarkdownString(`[${( localize(7329, "Learn more about the potential risks and how to avoid them."))}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`))
                 }]
             }
         });
         return promptResult.result === true;
     }
+    _createRiskBadge(parameters) {
+        if (!this.riskAssessmentService.isEnabled()) {
+            return undefined;
+        }
+        const tool = this.languageModelToolsService.getTool(this.toolInvocation.toolId);
+        if (!tool) {
+            return undefined;
+        }
+        const widget = this._register(this.instantiationService.createInstance(ToolRiskBadgeWidget));
+        const cached = this.riskAssessmentService.getCached(tool, parameters);
+        if (cached) {
+            widget.setAssessment(cached);
+        } else {
+            widget.setLoading();
+            const cts = this._register(( new CancellationTokenSource()));
+            (async () => {
+                try {
+                    const result = await this.riskAssessmentService.assess(tool, parameters, cts.token);
+                    if (cts.token.isCancellationRequested) {
+                        return;
+                    }
+                    if (!result) {
+                        widget.setHidden();
+                        return;
+                    }
+                    widget.setAssessment(result);
+                } catch {
+                    widget.setHidden();
+                }
+            })();
+        }
+        return widget;
+    }
     _appendMarkdownPart(container, message, codeBlockRenderOptions) {
         const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, {
             kind: "markdownContent",
@@ -450,6 +549,6 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
         append(container, part.domNode);
     }
 };
-ChatTerminalToolConfirmationSubPart = ( __decorate([( __param(7, IInstantiationService)), ( __param(8, IDialogService)), ( __param(9, IKeybindingService)), ( __param(10, ILanguageService)), ( __param(11, IConfigurationService)), ( __param(12, IContextKeyService)), ( __param(13, IChatWidgetService)), ( __param(14, IPreferencesService)), ( __param(15, IStorageService)), ( __param(16, ITerminalChatService)), ( __param(17, IHoverService))], ChatTerminalToolConfirmationSubPart));
+ChatTerminalToolConfirmationSubPart = ( __decorate([( __param(7, IInstantiationService)), ( __param(8, IDialogService)), ( __param(9, IKeybindingService)), ( __param(10, ILanguageService)), ( __param(11, IConfigurationService)), ( __param(12, IContextKeyService)), ( __param(13, IChatWidgetService)), ( __param(14, IPreferencesService)), ( __param(15, IStorageService)), ( __param(16, ITerminalChatService)), ( __param(17, IHoverService)), ( __param(18, ILanguageModelToolsService)), ( __param(19, IChatToolRiskAssessmentService))], ChatTerminalToolConfirmationSubPart));
 
 export { ChatTerminalToolConfirmationSubPart, TerminalToolConfirmationStorageKeys };

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

@@ -147,7 +147,8 @@ export declare class ChatTerminalThinkingCollapsibleWrapper extends ChatCollapsi
     private readonly _commandText;
     private readonly _isSandboxWrapped;
     private _isComplete;
-    constructor(commandText: string, isSandboxWrapped: boolean, contentElement: HTMLElement, context: IChatContentPartRenderContext, initialExpanded: boolean, isComplete: boolean, hoverService: IHoverService, configurationService: IConfigurationService);
+    private readonly _isSkipped;
+    constructor(commandText: string, isSandboxWrapped: boolean, contentElement: HTMLElement, context: IChatContentPartRenderContext, initialExpanded: boolean, isComplete: boolean, isSkipped: boolean, hoverService: IHoverService, configurationService: IConfigurationService);
     private _setCodeFormattedTitle;
     markComplete(): void;
     protected initContent(): HTMLElement;

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

@@ -7,7 +7,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { migrateLegacyTerminalToolSpecificData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
-import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatQueryTitlePart } from '../chatConfirmationWidget.js';
 import { ChatMarkdownContentPart } from '../chatMarkdownContentPart.js';
@@ -325,7 +325,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const markdownOptions = {
             codeBlockRenderOptions,
             accessibilityOptions: pastTenseMessage ? {
-                statusMessage: ( localize(7057, "{0}", stripIcons(pastTenseMessage)))
+                statusMessage: ( localize(7330, "{0}", stripIcons(pastTenseMessage)))
             } : undefined
         };
         this.markdownPart = this._register(_instantiationService.createInstance(
@@ -411,6 +411,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
     _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);
+        const isSkipped = IChatToolInvocation.executionConfirmedOrDenied(toolInvocation)?.type === ToolConfirmKind.Skipped;
         const autoExpandFailures = this._configurationService.getValue(ChatConfiguration.AutoExpandToolFailures);
         const hasError = autoExpandFailures && this._terminalData.terminalCommandState?.exitCode !== undefined && this._terminalData.terminalCommandState.exitCode !== 0;
         const initialExpanded = !isComplete || hasError;
@@ -421,7 +422,8 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             contentElement,
             context,
             initialExpanded,
-            isComplete
+            isComplete,
+            isSkipped
         ));
         this._thinkingCollapsibleWrapper = wrapper;
         let isFirstRun = true;
@@ -529,12 +531,12 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         this._actionBarActions.clear();
         const actions = [];
         if (this._toolbarCanContinueInBackground) {
-            const action = ( new Action(TerminalContribCommandId.ContinueInBackground, ( localize(7058, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true, () => this.continueInBackground()));
+            const action = ( new Action(TerminalContribCommandId.ContinueInBackground, ( localize(7331, "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(7059, "Show and Focus Terminal")) : ( localize(7060, "Focus Terminal"));
+            const focusLabel = this._toolbarIsHiddenTerminal ? ( localize(7332, "Show and Focus Terminal")) : ( localize(7333, "Focus Terminal"));
             const action = ( new Action(
                 TerminalContribCommandId.FocusChatInstanceAction,
                 focusLabel,
@@ -547,7 +549,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(7061, "Hide Output")) : ( localize(7062, "Show Output"));
+            const toggleLabel = this._toolbarOutputExpanded ? ( localize(7334, "Hide Output")) : ( localize(7335, "Show Output"));
             const action = ( new Action(
                 TerminalContribCommandId.ToggleChatTerminalOutput,
                 toggleLabel,
@@ -933,8 +935,10 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
             EventType.FOCUS_OUT,
             event => this._onDidBlurEmitter.fire(event)
         ));
-        const resizeObserver = this._register(new DisposableResizeObserver(() => this._handleResize()));
-        resizeObserver.observe(this.domNode);
+        const resizeObserver = this._register(
+            new DisposableResizeObserver("ChatTerminalToolProgressPart.handleResize", () => this._handleResize())
+        );
+        this._register(resizeObserver.observe(this.domNode));
         this._applyBackgroundColor();
         this._register(
             this._themeService.onDidColorThemeChange(() => this._applyBackgroundColor())
@@ -978,7 +982,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return;
         }
-        const ariaLabel = ( localize(7063, "Terminal output for {0}", commandText));
+        const ariaLabel = ( localize(7336, "Terminal output for {0}", commandText));
         const scrollableDomNode = this._scrollableContainer.getDomNode();
         scrollableDomNode.setAttribute("role", "region");
         const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.TerminalChatOutput);
@@ -991,26 +995,26 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return undefined;
         }
-        const commandHeader = ( localize(7064, "Command: {0}", commandText));
+        const commandHeader = ( localize(7337, "Command: {0}", commandText));
         if (command) {
             const rawOutput = command.getOutput();
             if (!rawOutput || rawOutput.trim().length === 0) {
-                return `${commandHeader}\n${( localize(7065, "No output was produced by the command."))}`;
+                return `${commandHeader}\n${( localize(7338, "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(7066, "Command output is no longer available."))}`;
+            return `${commandHeader}\n${( localize(7339, "Command output is no longer available."))}`;
         }
         const plain = removeAnsiEscapeCodes((snapshot.text ?? ""));
         if (!plain.trim().length) {
-            return `${commandHeader}\n${( localize(7065, "No output was produced by the command."))}`;
+            return `${commandHeader}\n${( localize(7338, "No output was produced by the command."))}`;
         }
         let outputText = plain.trimEnd();
         if (snapshot.truncated) {
-            outputText += `\n${( localize(7067, "Output truncated."))}`;
+            outputText += `\n${( localize(7340, "Output truncated."))}`;
         }
         return `${commandHeader}\n${outputText}`;
     }
@@ -1122,7 +1126,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         }
         if (!hasOutput) {
             if (commandFinished) {
-                this._showEmptyMessage(( localize(7065, "No output was produced by the command.")));
+                this._showEmptyMessage(( localize(7338, "No output was produced by the command.")));
             }
         } else {
             this._hideEmptyMessage();
@@ -1149,7 +1153,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (hasText) {
             this._hideEmptyMessage();
         } else {
-            this._showEmptyMessage(( localize(7065, "No output was produced by the command.")));
+            this._showEmptyMessage(( localize(7338, "No output was produced by the command.")));
         }
         const lineCount = result?.lineCount ?? snapshot.lineCount ?? 0;
         this._layoutOutput(lineCount);
@@ -1158,9 +1162,9 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         clearNode(this._terminalContainer);
         this._lastRenderedLineCount = undefined;
         if (!liveTerminalInstance) {
-            this._showEmptyMessage(( localize(7068, "Terminal is no longer available.")));
+            this._showEmptyMessage(( localize(7341, "Terminal is no longer available.")));
         } else {
-            this._showEmptyMessage(( localize(7069, "Command information is not available.")));
+            this._showEmptyMessage(( localize(7342, "Command information is not available.")));
         }
     }
     async _resolveLiveTerminal() {
@@ -1281,15 +1285,17 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         context,
         initialExpanded,
         isComplete,
+        isSkipped,
         hoverService,
         configurationService
     ) {
-        const title = isComplete ? ( localize(7070, "Ran {0}", commandText)) : ( localize(7071, "Running {0}", commandText));
+        const title = isSkipped ? ( localize(7343, "Skipped {0}", commandText)) : isComplete ? ( localize(7344, "Ran {0}", commandText)) : ( localize(7345, "Running {0}", commandText));
         super(title, context, undefined, hoverService, configurationService);
         this._terminalContentElement = contentElement;
         this._commandText = commandText;
         this._isSandboxWrapped = isSandboxWrapped;
         this._isComplete = isComplete;
+        this._isSkipped = isSkipped;
         this.domNode.classList.add("chat-terminal-thinking-collapsible");
         if (isComplete) {
             this.icon = Codicon.check;
@@ -1304,8 +1310,8 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         const labelElement = this._collapseButton.labelElement;
         labelElement.textContent = "";
         if (this._isSandboxWrapped) {
-            const prefixText = this._isComplete ? ( localize(7072, "Ran ")) : ( localize(7073, "Running "));
-            const suffixText = ( localize(7074, " in sandbox"));
+            const prefixText = this._isSkipped ? ( localize(7346, "Skipped ")) : this._isComplete ? ( localize(7347, "Ran ")) : ( localize(7348, "Running "));
+            const suffixText = ( localize(7349, " in sandbox"));
             labelElement.appendChild(createTextNode(prefixText));
             const codeElement = createElement("code");
             codeElement.textContent = this._commandText;
@@ -1313,7 +1319,7 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
             labelElement.appendChild(createTextNode(suffixText));
             return;
         }
-        const prefixText = this._isComplete ? ( localize(7075, "Ran ")) : ( localize(7076, "Running "));
+        const prefixText = this._isSkipped ? ( localize(7350, "Skipped ")) : this._isComplete ? ( localize(7351, "Ran ")) : ( localize(7352, "Running "));
         const ranText = createTextNode(prefixText);
         const codeElement = createElement("code");
         codeElement.textContent = this._commandText;
@@ -1340,6 +1346,6 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         return false;
     }
 };
-ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(6, IHoverService)), ( __param(7, IConfigurationService))], ChatTerminalThinkingCollapsibleWrapper));
+ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(7, IHoverService)), ( __param(8, IConfigurationService))], ChatTerminalThinkingCollapsibleWrapper));
 
 export { ChatTerminalThinkingCollapsibleWrapper, ChatTerminalToolProgressPart };

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

@@ -21,8 +21,13 @@ export declare class ChatToolConfirmationCarouselPart extends Disposable {
     private readonly prevButton;
     private readonly nextButton;
     private readonly allowAllButton;
+    private readonly expandContentButton;
     private readonly dismissButton;
     private readonly activeContentDisposables;
+    private readonly contentResizeObserver;
+    private readonly updateContentExpansionStateScheduler;
+    private _isContentExpanded;
+    private canExpandContent;
     private maxHeight;
     constructor(toolPartFactory: ToolInvocationPartFactory, initialTools: IChatToolInvocation[], scrollToSubagent?: ScrollToSubagentCallback | undefined, initialSubAgentInvocationId?: string | undefined, initialAgentName?: string | undefined);
     get pendingCount(): number;
@@ -40,7 +45,16 @@ export declare class ChatToolConfirmationCarouselPart extends Disposable {
     private focusActiveContent;
     private updateUI;
     private renderActiveContent;
+    private toggleContentExpanded;
+    private updateContentExpansionState;
     private updateMaxHeightStyle;
+    private updateExpandContentButton;
+    private isActiveContentLargerThanCollapsedLimit;
+    private hasInnerContentLargerThanCollapsedLimit;
+    private isExpandableContentElement;
+    private observeExpandableContentElements;
+    private getElementHeight;
+    private getExpandableContentHeightLimit;
     private getCollapsedMaxHeight;
     allowAll(): void;
     private skipAll;