@codingame/monaco-vscode-katex-common 32.0.2 → 33.0.9

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

@@ -148,8 +148,13 @@ export declare class ChatTerminalThinkingCollapsibleWrapper extends ChatCollapsi
     private readonly _isSandboxWrapped;
     private _isComplete;
     private readonly _isSkipped;
-    constructor(commandText: string, isSandboxWrapped: boolean, contentElement: HTMLElement, context: IChatContentPartRenderContext, initialExpanded: boolean, isComplete: boolean, isSkipped: boolean, hoverService: IHoverService, configurationService: IConfigurationService);
+    private _isRunningInBackground;
+    private readonly _onFocusTerminal;
+    private readonly _showLinkDisposables;
+    private _showLinkElement;
+    constructor(commandText: string, isSandboxWrapped: boolean, contentElement: HTMLElement, context: IChatContentPartRenderContext, initialExpanded: boolean, isComplete: boolean, isSkipped: boolean, isRunningInBackground: boolean, onFocusTerminal: (() => void) | undefined, hoverService: IHoverService, configurationService: IConfigurationService);
     private _setCodeFormattedTitle;
+    private _updateShowLink;
     markComplete(): void;
     protected initContent(): HTMLElement;
     expand(): void;

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, $ } 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 { MarkdownString, isMarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -27,6 +27,8 @@ import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { getTerminalCommandDecorationTooltip, getTerminalCommandDecorationState, DecorationSelector } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/xterm/decorationStyles';
+import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
+import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base/common/scrollable';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -325,7 +327,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const markdownOptions = {
             codeBlockRenderOptions,
             accessibilityOptions: pastTenseMessage ? {
-                statusMessage: ( localize(7341, "{0}", stripIcons(pastTenseMessage)))
+                statusMessage: ( localize(7416, "{0}", stripIcons(pastTenseMessage)))
             } : undefined
         };
         this.markdownPart = this._register(_instantiationService.createInstance(
@@ -410,7 +412,10 @@ 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 toolInvocationComplete = IChatToolInvocation.isComplete(toolInvocation);
+        const commandHasNotFinished = this._terminalData.terminalCommandState?.exitCode === undefined;
+        const isRunningInBackground = toolInvocationComplete && commandHasNotFinished && (this._terminalData.isBackground === true || this._terminalData.didContinueInBackground === true);
+        const isComplete = toolInvocationComplete && !isRunningInBackground;
         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;
@@ -423,7 +428,9 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             context,
             initialExpanded,
             isComplete,
-            isSkipped
+            isSkipped,
+            isRunningInBackground,
+            () => this.focusTerminal()
         ));
         this._thinkingCollapsibleWrapper = wrapper;
         let isFirstRun = true;
@@ -531,12 +538,12 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         this._actionBarActions.clear();
         const actions = [];
         if (this._toolbarCanContinueInBackground) {
-            const action = ( new Action(TerminalContribCommandId.ContinueInBackground, ( localize(7342, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true, () => this.continueInBackground()));
+            const action = ( new Action(TerminalContribCommandId.ContinueInBackground, ( localize(7417, "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(7343, "Show and Focus Terminal")) : ( localize(7344, "Focus Terminal"));
+            const focusLabel = this._toolbarIsHiddenTerminal ? ( localize(7418, "Show and Focus Terminal")) : ( localize(7419, "Focus Terminal"));
             const action = ( new Action(
                 TerminalContribCommandId.FocusChatInstanceAction,
                 focusLabel,
@@ -549,7 +556,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(7345, "Hide Output")) : ( localize(7346, "Show Output"));
+            const toggleLabel = this._toolbarOutputExpanded ? ( localize(7420, "Hide Output")) : ( localize(7421, "Show Output"));
             const action = ( new Action(
                 TerminalContribCommandId.ToggleChatTerminalOutput,
                 toggleLabel,
@@ -777,7 +784,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         widget?.focusInput();
     }
     async focusTerminal() {
-        const instance = this._terminalInstance;
+        const instance = await this._ensureTerminalInstance();
         let target = "none";
         let location = "panel";
         if (instance) {
@@ -982,7 +989,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return;
         }
-        const ariaLabel = ( localize(7347, "Terminal output for {0}", commandText));
+        const ariaLabel = ( localize(7422, "Terminal output for {0}", commandText));
         const scrollableDomNode = this._scrollableContainer.getDomNode();
         scrollableDomNode.setAttribute("role", "region");
         const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.TerminalChatOutput);
@@ -995,26 +1002,26 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return undefined;
         }
-        const commandHeader = ( localize(7348, "Command: {0}", commandText));
+        const commandHeader = ( localize(7423, "Command: {0}", commandText));
         if (command) {
             const rawOutput = command.getOutput();
             if (!rawOutput || rawOutput.trim().length === 0) {
-                return `${commandHeader}\n${( localize(7349, "No output was produced by the command."))}`;
+                return `${commandHeader}\n${( localize(7424, "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(7350, "Command output is no longer available."))}`;
+            return `${commandHeader}\n${( localize(7425, "Command output is no longer available."))}`;
         }
         const plain = removeAnsiEscapeCodes((snapshot.text ?? ""));
         if (!plain.trim().length) {
-            return `${commandHeader}\n${( localize(7349, "No output was produced by the command."))}`;
+            return `${commandHeader}\n${( localize(7424, "No output was produced by the command."))}`;
         }
         let outputText = plain.trimEnd();
         if (snapshot.truncated) {
-            outputText += `\n${( localize(7351, "Output truncated."))}`;
+            outputText += `\n${( localize(7426, "Output truncated."))}`;
         }
         return `${commandHeader}\n${outputText}`;
     }
@@ -1126,7 +1133,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         }
         if (!hasOutput) {
             if (commandFinished) {
-                this._showEmptyMessage(( localize(7349, "No output was produced by the command.")));
+                this._showEmptyMessage(( localize(7424, "No output was produced by the command.")));
             }
         } else {
             this._hideEmptyMessage();
@@ -1153,7 +1160,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (hasText) {
             this._hideEmptyMessage();
         } else {
-            this._showEmptyMessage(( localize(7349, "No output was produced by the command.")));
+            this._showEmptyMessage(( localize(7424, "No output was produced by the command.")));
         }
         const lineCount = result?.lineCount ?? snapshot.lineCount ?? 0;
         this._layoutOutput(lineCount);
@@ -1162,9 +1169,9 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         clearNode(this._terminalContainer);
         this._lastRenderedLineCount = undefined;
         if (!liveTerminalInstance) {
-            this._showEmptyMessage(( localize(7352, "Terminal is no longer available.")));
+            this._showEmptyMessage(( localize(7427, "Terminal is no longer available.")));
         } else {
-            this._showEmptyMessage(( localize(7353, "Command information is not available.")));
+            this._showEmptyMessage(( localize(7428, "Command information is not available.")));
         }
     }
     async _resolveLiveTerminal() {
@@ -1286,21 +1293,27 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         initialExpanded,
         isComplete,
         isSkipped,
+        isRunningInBackground,
+        onFocusTerminal,
         hoverService,
         configurationService
     ) {
-        const title = isSkipped ? ( localize(7354, "Skipped {0}", commandText)) : isComplete ? ( localize(7355, "Ran {0}", commandText)) : ( localize(7356, "Running {0}", commandText));
+        const title = isSkipped ? ( localize(7429, "Skipped {0}", commandText)) : isRunningInBackground ? ( localize(7430, "Running {0} in background", commandText)) : isComplete ? ( localize(7431, "Ran {0}", commandText)) : ( localize(7432, "Running {0}", commandText));
         super(title, context, undefined, hoverService, configurationService);
+        this._showLinkDisposables = this._register(( new MutableDisposable()));
         this._terminalContentElement = contentElement;
         this._commandText = commandText;
         this._isSandboxWrapped = isSandboxWrapped;
         this._isComplete = isComplete;
         this._isSkipped = isSkipped;
+        this._isRunningInBackground = isRunningInBackground;
+        this._onFocusTerminal = onFocusTerminal;
         this.domNode.classList.add("chat-terminal-thinking-collapsible");
         if (isComplete) {
             this.icon = Codicon.check;
         }
         this._setCodeFormattedTitle();
+        this._updateShowLink();
         this.setExpanded(initialExpanded);
     }
     _setCodeFormattedTitle() {
@@ -1310,8 +1323,8 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         const labelElement = this._collapseButton.labelElement;
         labelElement.textContent = "";
         if (this._isSandboxWrapped) {
-            const prefixText = this._isSkipped ? ( localize(7357, "Skipped ")) : this._isComplete ? ( localize(7358, "Ran ")) : ( localize(7359, "Running "));
-            const suffixText = ( localize(7360, " in sandbox"));
+            const prefixText = this._isSkipped ? ( localize(7433, "Skipped ")) : this._isComplete ? ( localize(7434, "Ran ")) : ( localize(7435, "Running "));
+            const suffixText = this._isRunningInBackground ? ( localize(7436, " in sandbox (background)")) : ( localize(7437, " in sandbox"));
             labelElement.appendChild(createTextNode(prefixText));
             const codeElement = createElement("code");
             codeElement.textContent = this._commandText;
@@ -1319,20 +1332,56 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
             labelElement.appendChild(createTextNode(suffixText));
             return;
         }
-        const prefixText = this._isSkipped ? ( localize(7361, "Skipped ")) : this._isComplete ? ( localize(7362, "Ran ")) : ( localize(7363, "Running "));
+        const prefixText = this._isSkipped ? ( localize(7438, "Skipped ")) : this._isComplete ? ( localize(7439, "Ran ")) : ( localize(7440, "Running "));
         const ranText = createTextNode(prefixText);
         const codeElement = createElement("code");
         codeElement.textContent = this._commandText;
         labelElement.appendChild(ranText);
         labelElement.appendChild(codeElement);
+        if (this._isRunningInBackground) {
+            labelElement.appendChild(createTextNode(( localize(7441, " in background"))));
+        }
+    }
+    _updateShowLink() {
+        this._showLinkElement?.remove();
+        this._showLinkElement = undefined;
+        this._showLinkDisposables.value = undefined;
+        if (!this._isRunningInBackground || !this._onFocusTerminal || !this._collapseButton) {
+            return;
+        }
+        const labelElement = this._collapseButton.labelElement;
+        const store = ( new DisposableStore());
+        this._showLinkDisposables.value = store;
+        const container = $("span.chat-terminal-show-link-container");
+        container.appendChild(createTextNode(" — "));
+        const showLink = $("span.chat-terminal-show-link");
+        showLink.textContent = ( localize(7442, "Show"));
+        showLink.role = "button";
+        showLink.tabIndex = 0;
+        store.add(addDisposableListener(showLink, EventType.CLICK, e => {
+            EventHelper.stop(e, true);
+            this._onFocusTerminal?.();
+        }));
+        store.add(addDisposableListener(showLink, EventType.KEY_DOWN, e => {
+            const keyboardEvent = ( new StandardKeyboardEvent(e));
+            if (keyboardEvent.equals(KeyCode.Enter) || keyboardEvent.equals(KeyCode.Space)) {
+                EventHelper.stop(e, true);
+                this._onFocusTerminal?.();
+            }
+        }));
+        container.appendChild(showLink);
+        labelElement.appendChild(container);
+        this._showLinkElement = container;
     }
     markComplete() {
         if (this._isComplete) {
             return;
         }
         this._isComplete = true;
+        this._isRunningInBackground = false;
         this.icon = Codicon.check;
         this._setCodeFormattedTitle();
+        this._updateShowLink();
     }
     initContent() {
         const listWrapper = $(".chat-used-context-list.chat-terminal-thinking-content");
@@ -1346,6 +1395,6 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         return false;
     }
 };
-ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(7, IHoverService)), ( __param(8, IConfigurationService))], ChatTerminalThinkingCollapsibleWrapper));
+ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(9, IHoverService)), ( __param(10, 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(7364, "Tool confirmation carousel")));
+        this.domNode.setAttribute("aria-label", ( localize(7443, "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(7365, "Allow All"));
+        this.allowAllButton.label = ( localize(7444, "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(7366, "Skip")) : ( localize(7367, "Skip All"));
+        const dismissButtonLabel = this.items.length === 1 ? ( localize(7445, "Skip")) : ( localize(7446, "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(7368, "Previous")));
+        this.prevButton.element.setAttribute("aria-label", ( localize(7447, "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(7369, "Next")));
+        this.nextButton.element.setAttribute("aria-label", ( localize(7448, "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(7370, "Scroll to {0}", item.agentName));
+            this.agentLabel.title = ( localize(7449, "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(7365, "Allow All")) : ( localize(7371, "Allow"));
+        this.allowAllButton.label = multi ? ( localize(7444, "Allow All")) : ( localize(7450, "Allow"));
         this.updateExpandContentButton();
     }
     renderActiveContent() {
@@ -381,7 +381,7 @@ class ChatToolConfirmationCarouselPart extends Disposable {
     }
     updateExpandContentButton() {
         const expanded = this.canExpandContent && this._isContentExpanded;
-        const label = expanded ? ( localize(7372, "Restore Confirmation Size")) : ( localize(7373, "Expand Confirmation Up"));
+        const label = expanded ? ( localize(7451, "Restore Confirmation Size")) : ( localize(7452, "Expand Confirmation Up"));
         this.expandContentButton.label = expanded ? `$(${Codicon.screenNormal.id})` : `$(${Codicon.screenFull.id})`;
         this.expandContentButton.element.setAttribute("aria-label", label);
         this.expandContentButton.element.setAttribute("aria-expanded", String(expanded));

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

@@ -78,8 +78,8 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         this.render({
             allowActionId: AcceptToolConfirmationActionId,
             skipActionId: SkipToolConfirmationActionId,
-            allowLabel: state.confirmationMessages.confirmResults ? ( localize(7374, "Allow and Review Once")) : ( localize(7375, "Allow Once")),
-            skipLabel: ( localize(7376, "Proceed without running this tool")),
+            allowLabel: state.confirmationMessages.confirmResults ? ( localize(7453, "Allow and Review Once")) : ( localize(7454, "Allow Once")),
+            skipLabel: ( localize(7455, "Proceed without running this tool")),
             partType: "chatToolConfirmation",
             subtitle: typeof toolInvocation.originMessage === "string" ? toolInvocation.originMessage : toolInvocation.originMessage?.value
         });
@@ -125,7 +125,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         }
         if (state.confirmationMessages?.confirmResults) {
             actions.unshift({
-                label: ( localize(7377, "Allow and Skip Reviewing Result")),
+                label: ( localize(7456, "Allow and Skip Reviewing Result")),
                 data: () => {
                     state.confirmationMessages.confirmResults = undefined;
                     this.confirmWith(this.toolInvocation, {
@@ -167,11 +167,11 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
             };
             const elements = h("div", [h(".message@messageContainer", [
                 h(".message-wrapper@message"),
-                h(".see-more@showMore", [h("a", [( localize(7378, "Show More"))])])
+                h(".see-more@showMore", [h("a", [( localize(7457, "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(7379, "Input"));
+                titleEl.textContent = ( localize(7458, "Input"));
                 elements.editor.appendChild(titleEl);
                 const inputData = toolInvocation.toolSpecificData;
                 const codeBlockRenderOptions = {
@@ -241,7 +241,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
                 elements.editor.append(editor.object.element);
                 if (canSeeMore) {
                     const seeMore = h("div.see-more", [h("a@link")]);
-                    seeMore.link.textContent = ( localize(7380, "See more"));
+                    seeMore.link.textContent = ( localize(7459, "See more"));
                     this._register(addDisposableGenericMouseDownListener(seeMore.link, () => {
                         try {
                             const parsed = JSON.parse(model.getValue());

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

@@ -2,22 +2,20 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 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 { IChatOutputRendererService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.service";
 import { IChatContentPartRenderContext } from "../chatContentParts.js";
+import { IChatOutputPartStateCache } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatOutputPartStateCache.service";
 import { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
-import { IChatToolOutputStateCache } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.service";
 export declare class ChatToolOutputSubPart extends BaseChatToolInvocationSubPart {
     private readonly context;
     private readonly onDidRemount;
     private readonly chatOutputItemRendererService;
-    private readonly chatWidgetService;
     private readonly instantiationService;
     private readonly stateCache;
     readonly domNode: HTMLElement;
     readonly codeblocks: IChatCodeBlockInfo[];
     private readonly _disposeCts;
-    constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, onDidRemount: Event<void>, chatOutputItemRendererService: IChatOutputRendererService, chatWidgetService: IChatWidgetService, instantiationService: IInstantiationService, stateCache: IChatToolOutputStateCache);
+    constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, onDidRemount: Event<void>, chatOutputItemRendererService: IChatOutputRendererService, instantiationService: IInstantiationService, stateCache: IChatOutputPartStateCache);
     dispose(): void;
     private createOutputPart;
 }

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

@@ -7,15 +7,13 @@ import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IChatToolInvocation } 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 { IChatOutputRendererService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.service';
 import { ChatProgressSubPart } from '../chatProgressContentPart.js';
+import { IChatOutputPartStateCache } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatOutputPartStateCache.service';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-import { IChatToolOutputStateCache } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.service';
 
 let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvocationSubPart {
     constructor(
@@ -23,7 +21,6 @@ let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvo
         context,
         onDidRemount,
         chatOutputItemRendererService,
-        chatWidgetService,
         instantiationService,
         stateCache
     ) {
@@ -31,7 +28,6 @@ let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvo
         this.context = context;
         this.onDidRemount = onDidRemount;
         this.chatOutputItemRendererService = chatOutputItemRendererService;
-        this.chatWidgetService = chatWidgetService;
         this.instantiationService = instantiationService;
         this.stateCache = stateCache;
         this.codeblocks = [];
@@ -64,18 +60,14 @@ let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvo
         const parent = $("div.webview-output");
         parent.style.maxHeight = "80vh";
         const partState = this.stateCache.get(toolInvocation.toolCallId) ?? {
-            height: 0,
-            webviewOrigin: generateUuid()
+            height: 0
         };
         this.stateCache.set(toolInvocation.toolCallId, partState);
         if (partState.height) {
             parent.style.height = `${partState.height}px`;
         }
-        if (partState.webviewOrigin) {
-            partState.webviewOrigin = partState.webviewOrigin;
-        }
         const progressMessage = $("span");
-        progressMessage.textContent = ( localize(7381, "Rendering tool output..."));
+        progressMessage.textContent = ( localize(7460, "Rendering tool output..."));
         const progressPart = this._register(this.instantiationService.createInstance(
             ChatProgressSubPart,
             progressMessage,
@@ -84,8 +76,8 @@ let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvo
         ));
         parent.appendChild(progressPart.domNode);
         this.chatOutputItemRendererService.renderOutputPart(details.output.mimeType, details.output.value.buffer, parent, {
-            origin: partState.webviewOrigin,
-            webviewState: partState.webviewState
+            webviewState: partState.webviewState,
+            chatSessionResource: this.context.element.sessionResource
         }, this._disposeCts.token).then(renderedItem => {
             if (this._disposeCts.token.isCancellationRequested) {
                 return;
@@ -98,13 +90,6 @@ let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvo
             this._register(renderedItem.onDidChangeHeight(newHeight => {
                 partState.height = newHeight;
             }));
-            this._register(renderedItem.webview.onDidWheel(e => {
-                this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.delegateScrollFromMouseWheelEvent({
-                    ...e,
-                    preventDefault: () => {},
-                    stopPropagation: () => {}
-                });
-            }));
             this._register(this.context.onDidChangeVisibility(visible => {
                 if (visible) {
                     renderedItem.reinitialize();
@@ -125,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(7382, "Error rendering the tool output"));
+            errorTitleNode.textContent = ( localize(7461, "Error rendering the tool output"));
             errorHeaderNode.append(errorTitleNode);
             const errorMessageNode = $(".output-error-details");
             errorMessageNode.textContent = error?.message || String(error);
@@ -135,6 +120,6 @@ let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvo
         return parent;
     }
 };
-ChatToolOutputSubPart = ( __decorate([( __param(3, IChatOutputRendererService)), ( __param(4, IChatWidgetService)), ( __param(5, IInstantiationService)), ( __param(6, IChatToolOutputStateCache))], ChatToolOutputSubPart));
+ChatToolOutputSubPart = ( __decorate([( __param(3, IChatOutputRendererService)), ( __param(4, IInstantiationService)), ( __param(5, IChatOutputPartStateCache))], ChatToolOutputSubPart));
 
 export { ChatToolOutputSubPart };

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

@@ -26,20 +26,20 @@ function getApprovalMessageFromReason(reason) {
     let md;
     switch (reason.type) {
     case ToolConfirmKind.Setting:
-        md = ( localize(7383, "Auto approved by {0}", createMarkdownCommandLink({
+        md = ( localize(7462, "Auto approved by {0}", createMarkdownCommandLink({
             text: "`" + reason.id + "`",
             id: "workbench.action.openSettings",
             arguments: [reason.id],
-            tooltip: ( localize(7384, "Open settings"))
+            tooltip: ( localize(7463, "Open settings"))
         }, false)));
         break;
     case ToolConfirmKind.LmServicePerTool:
-        md = reason.scope === "session" ? ( localize(7385, "Auto approved for this session")) : reason.scope === "workspace" ? ( localize(7386, "Auto approved for this workspace")) : ( localize(7387, "Auto approved for this profile"));
+        md = reason.scope === "session" ? ( localize(7464, "Auto approved for this session")) : reason.scope === "workspace" ? ( localize(7465, "Auto approved for this workspace")) : ( localize(7466, "Auto approved for this profile"));
         md += " (" + createMarkdownCommandLink({
-            text: ( localize(7388, "Edit")),
+            text: ( localize(7467, "Edit")),
             id: "workbench.action.chat.editToolApproval",
             arguments: [reason.scope],
-            tooltip: ( localize(7389, "Edit tool approval settings"))
+            tooltip: ( localize(7468, "Edit tool approval settings"))
         }) + ")";
         break;
     case ToolConfirmKind.ConfirmationNotNeeded:

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(7390, "Allow Once")),
-            skipLabel: ( localize(7391, "Skip Results")),
+            allowLabel: ( localize(7469, "Allow Once")),
+            skipLabel: ( localize(7470, "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(7392, "Approve Tool Result");
+        return localize(7471, "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(7393, "No results to display"));
+            container.textContent = ( localize(7472, "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(7394, "No displayable results"));
+        container.textContent = ( localize(7473, "No displayable results"));
         return container;
     }
 };

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

@@ -35,7 +35,7 @@ let ChatToolProgressSubPart = class ChatToolProgressSubPart extends BaseChatTool
     }
     createProgressPart() {
         const isComplete = IChatToolInvocation.isComplete(this.toolInvocation);
-        if (isComplete && this.toolIsConfirmed && this.toolInvocation.pastTenseMessage) {
+        if (isComplete && this.toolIsConfirmed && (this.toolInvocation.pastTenseMessage || this.toolInvocation.invocationMessage)) {
             const key = this.getAnnouncementKey("complete");
             const completionContent = this.toolInvocation.pastTenseMessage ?? this.toolInvocation.invocationMessage;
             if (!this.hasMeaningfulContent(completionContent)) {
@@ -55,8 +55,8 @@ let ChatToolProgressSubPart = class ChatToolProgressSubPart extends BaseChatTool
                     if (state.type === IChatToolInvocation.StateKind.Cancelled && state.reasonMessage) {
                         progressContent = state.reasonMessage;
                     } else if (state.type === IChatToolInvocation.StateKind.Executing) {
-                        const progress = state.progress.read(reader);
-                        progressContent = progress?.message ?? this.toolInvocation.invocationMessage;
+                        const progressMessage = state.progress.read(reader)?.message;
+                        progressContent = this.hasMeaningfulContent(progressMessage) ? progressMessage : this.toolInvocation.invocationMessage;
                     } else {
                         progressContent = this.toolInvocation.invocationMessage;
                     }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/media/toolRiskBadge.css

@@ -25,8 +25,8 @@
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
-	min-width: 13px;
-	font-size: 13px;
+	min-width: 12px;
+	font-size: 12px;
 	line-height: 1;
 	color: var(--tool-risk-accent, var(--vscode-descriptionForeground));
 }
@@ -48,7 +48,7 @@
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
-	font-size: 13px;
+	font-size: 12px;
 	line-height: 1;
 	color: var(--vscode-descriptionForeground);
 	cursor: pointer;

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

@@ -6,6 +6,7 @@ import { IToolRiskAssessment } from "../../../tools/chatToolRiskAssessmentServic
 export declare class ToolRiskBadgeWidget extends Disposable {
     private readonly _hoverService;
     readonly domNode: HTMLElement;
+    get isDisposed(): boolean;
     private readonly _iconEl;
     private readonly _textEl;
     private readonly _detailsIconEl;