@codingame/monaco-vscode-katex-common 27.0.0 → 28.0.0

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

@@ -4,7 +4,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 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 { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPartRenderContext } from "../chatContentParts.js";
 import { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
 /**
  * Data needed to render an MCP App, available before tool completion.
@@ -39,6 +39,10 @@ export declare class ChatMcpAppSubPart extends BaseChatToolInvocationSubPart {
     private readonly _progressPart;
     /** Current error node */
     private _errorNode;
+    /** Container for download resource pills */
+    private readonly _downloadContainer;
+    /** Current resource group widget for downloads */
+    private readonly _downloadWidget;
     constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, onDidRemount: Event<void>, context: IChatContentPartRenderContext, _renderData: IMcpAppRenderData, _instantiationService: IInstantiationService, _markdownRendererService: IMarkdownRendererService);
     private _handleLoadStateChange;
     private _updateContainerHeight;

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $, getWindow, addDisposableListener, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, getWindow, addDisposableListener, clearNode, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
@@ -14,6 +14,7 @@ import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { ChatErrorLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { ChatErrorWidget } from '../chatErrorContentPart.js';
 import { ChatProgressSubPart } from '../chatProgressContentPart.js';
+import { ChatResourceGroupWidget } from '../chatResourceGroupWidget.js';
 import { ChatMcpAppModel } from './chatMcpAppModel.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -35,12 +36,15 @@ let ChatMcpAppSubPart = class ChatMcpAppSubPart extends BaseChatToolInvocationSu
         this._markdownRendererService = _markdownRendererService;
         this.codeblocks = [];
         this._progressPart = this._register(( new MutableDisposable()));
+        this._downloadWidget = this._register(( new MutableDisposable()));
         this.domNode = $("div.mcp-app-part");
         this._webviewContainer = $("div.mcp-app-webview");
         this._webviewContainer.style.maxHeight = `${maxWebviewHeightPct * 100}vh`;
         this._webviewContainer.style.minHeight = "100px";
         this._webviewContainer.style.height = "300px";
         this.domNode.appendChild(this._webviewContainer);
+        this._downloadContainer = $("div.mcp-app-downloads");
+        this.domNode.appendChild(this._downloadContainer);
         const targetWindow = getWindow(this.domNode);
         const getMaxHeight = () => maxWebviewHeightPct * targetWindow.innerHeight;
         const maxHeight = observableValue("mcpAppMaxHeight", getMaxHeight());
@@ -61,6 +65,18 @@ let ChatMcpAppSubPart = class ChatMcpAppSubPart extends BaseChatToolInvocationSu
         this._register(this._model.onDidChangeHeight(() => {
             this._updateContainerHeight();
         }));
+        this._register(autorun(reader => {
+            const parts = this._model.downloadParts.read(reader);
+            if (parts.length === 0) {
+                this._downloadWidget.clear();
+                clearNode(this._downloadContainer);
+                return;
+            }
+            clearNode(this._downloadContainer);
+            const widget = this._instantiationService.createInstance(ChatResourceGroupWidget, parts);
+            this._downloadWidget.value = widget;
+            this._downloadContainer.appendChild(widget.domNode);
+        }));
         this._register(onDidRemount(() => {
             this._model.remount();
         }));
@@ -84,7 +100,7 @@ let ChatMcpAppSubPart = class ChatMcpAppSubPart extends BaseChatToolInvocationSu
             {
                 container.style.display = "none";
                 const progressMessage = $("span");
-                progressMessage.textContent = ( localize(6565, "Loading MCP App..."));
+                progressMessage.textContent = ( localize(6661, "Loading MCP App..."));
                 const progressPart = this._instantiationService.createInstance(
                     ChatProgressSubPart,
                     progressMessage,
@@ -114,12 +130,12 @@ let ChatMcpAppSubPart = class ChatMcpAppSubPart extends BaseChatToolInvocationSu
     _showError(container, error) {
         const errorNode = $(".mcp-app-error");
         const errorMessage = ( new MarkdownString());
-        errorMessage.appendText(( localize(6566, "Error loading MCP App: {0}", error.message || String(error))));
+        errorMessage.appendText(( localize(6662, "Error loading MCP App: {0}", error.message || String(error))));
         const errorWidget = this._register(( new ChatErrorWidget(ChatErrorLevel.Error, errorMessage, this._markdownRendererService)));
         errorNode.appendChild(errorWidget.domNode);
         const buttonContainer = append(errorNode, $(".chat-buttons-container"));
         const retryButton = this._register(( new Button(buttonContainer, defaultButtonStyles)));
-        retryButton.label = ( localize(6567, "Retry"));
+        retryButton.label = ( localize(6663, "Retry"));
         this._register(retryButton.onDidClick(() => {
             this._model.retry();
         }));

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

@@ -4,7 +4,7 @@ import { Location } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/l
 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 { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPartRenderContext } from "../chatContentParts.js";
 import { CollapsibleListPool } from "../chatReferencesContentPart.js";
 import { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
 export declare class ChatResultListSubPart extends BaseChatToolInvocationSubPart {

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

@@ -5,7 +5,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 { IChatSimpleToolInvocationData, 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 { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPartRenderContext } from "../chatContentParts.js";
 import { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
 export declare class ChatSimpleToolProgressPart extends BaseChatToolInvocationSubPart {
     /** Remembers expanded tool parts on re-render */

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

@@ -16,7 +16,7 @@ import type { CodeBlockModelCollection } from "../../../../common/widget/codeBlo
 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 { EditorPool } from "../chatContentCodePools.js";
-import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPartRenderContext } from "../chatContentParts.js";
 import { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
 export declare enum TerminalToolConfirmationStorageKeys {
     TerminalAutoApproveWarningAccepted = "chat.tools.terminal.autoApprove.warningAccepted"

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

@@ -113,7 +113,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             moreActions = [];
             if (!autoApproveWarningAccepted) {
                 moreActions.push({
-                    label: ( localize(6568, "Enable Auto Approve...")),
+                    label: ( localize(6664, "Enable Auto Approve...")),
                     data: {
                         type: "enable"
                     }
@@ -319,7 +319,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(6569, "View rule in settings"))}")`;
+                                return `[\`${e.key}\`](${( settingsUri.toString())} "${( localize(6665, "View rule in settings"))}")`;
                             })).join(", ");
                         }
                         const mdTrustSettings = {
@@ -330,33 +330,33 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                         const parts = [];
                         if (sessionRules.length > 0) {
                             parts.push(sessionRules.length === 1 ? ( localize(
-                                6570,
+                                6666,
                                 "Session auto approve rule {0} added",
                                 formatRuleLinks(sessionRules, "session")
                             )) : ( localize(
-                                6571,
+                                6667,
                                 "Session auto approve rules {0} added",
                                 formatRuleLinks(sessionRules, "session")
                             )));
                         }
                         if (workspaceRules.length > 0) {
                             parts.push(workspaceRules.length === 1 ? ( localize(
-                                6572,
+                                6668,
                                 "Workspace auto approve rule {0} added",
                                 formatRuleLinks(workspaceRules, "workspace")
                             )) : ( localize(
-                                6573,
+                                6669,
                                 "Workspace auto approve rules {0} added",
                                 formatRuleLinks(workspaceRules, "workspace")
                             )));
                         }
                         if (userRules.length > 0) {
                             parts.push(userRules.length === 1 ? ( localize(
-                                6574,
+                                6670,
                                 "User auto approve rule {0} added",
                                 formatRuleLinks(userRules, "user")
                             )) : ( localize(
-                                6575,
+                                6671,
                                 "User auto approve rules {0} added",
                                 formatRuleLinks(userRules, "user")
                             )));
@@ -386,7 +386,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                                 enabledCommands: [TerminalContribCommandId.DisableSessionAutoApproval]
                             }
                         };
-                        terminalData.autoApproveInfo = ( new MarkdownString(`${( localize(6576, "All commands will be auto approved for this session"))} ([${( localize(6577, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings));
+                        terminalData.autoApproveInfo = ( new MarkdownString(`${( localize(6672, "All commands will be auto approved for this session"))} ([${( localize(6673, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings));
                         toolConfirmKind = ToolConfirmKind.UserAction;
                         break;
                     }
@@ -410,11 +410,11 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             };
         };
         return [{
-            ...getLabelAndTooltip(( localize(6578, "Allow")), AcceptToolConfirmationActionId),
+            ...getLabelAndTooltip(( localize(6674, "Allow")), AcceptToolConfirmationActionId),
             data: true,
             moreActions
         }, {
-            ...getLabelAndTooltip(( localize(6579, "Skip")), SkipToolConfirmationActionId, ( localize(6580, "Proceed without executing this command"))),
+            ...getLabelAndTooltip(( localize(6675, "Skip")), SkipToolConfirmationActionId, ( localize(6676, "Proceed without executing this command"))),
             data: {
                 type: "skip"
             },
@@ -424,9 +424,9 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
     async _showAutoApproveWarning() {
         const promptResult = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(6581, "Enable terminal auto approve?")),
+            message: ( localize(6677, "Enable terminal auto approve?")),
             buttons: [{
-                label: ( localize(6582, "Enable")),
+                label: ( localize(6678, "Enable")),
                 run: () => true
             }],
             cancelButton: true,
@@ -434,11 +434,11 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                 icon: Codicon.shield,
                 markdownDetails: [{
                     markdown: ( new MarkdownString(( localize(
-                        6583,
+                        6679,
                         "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(6584, "Learn more about the potential risks and how to avoid them."))}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`))
+                    markdown: ( new MarkdownString(`[${( localize(6680, "Learn more about the potential risks and how to avoid them."))}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`))
                 }]
             }
         });

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

@@ -4,7 +4,7 @@ import { IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalT
 import { CodeBlockModelCollection } from "../../../../common/widget/codeBlockModelCollection.js";
 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 { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPartRenderContext } from "../chatContentParts.js";
 import { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
 import { Action, IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
 import { IChatTerminalToolProgressPart, ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
@@ -19,6 +19,25 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { EditorPool } from "../chatContentCodePools.js";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+/**
+ * A chat content part that displays terminal tool invocation progress.
+ *
+ * This component shows:
+ * - The command being executed with syntax highlighting
+ * - A status decoration indicating success/failure/running state
+ * - Expandable terminal output with live streaming support
+ * - Actions to focus the terminal, show/hide output, and continue in background
+ *
+ * The component supports two rendering modes:
+ * - Standard mode: Shows full progress with status indicators
+ * - Collapsible wrapper mode: For thinking containers with simplified UI
+ *
+ * Output auto-expansion behavior:
+ * - Long-running commands with output auto-expand after a short delay
+ * - Fast commands that complete quickly don't auto-expand (prevents flickering)
+ * - Failed commands can be configured to auto-expand via settings
+ * - Successful commands auto-collapse if output was auto-expanded
+ */
 export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart implements IChatTerminalToolProgressPart {
     private readonly _instantiationService;
     private readonly _terminalChatService;
@@ -64,9 +83,32 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     private _getResolvedCommand;
     private _ensureShowOutputAction;
     private _clearCommandAssociation;
+    /**
+     * Determines whether the terminal output should auto-expand.
+     * Returns false if already expanded, user has manually toggled, component is disposed,
+     * or if the invocation was previously expanded (to preserve state across re-renders).
+     */
+    private _shouldAutoExpand;
+    /**
+     * Registers event listeners on the terminal instance to track command execution,
+     * manage auto-expansion of output, and handle command completion.
+     *
+     * This method sets up:
+     * - Command detection listeners for tracking command lifecycle
+     * - Auto-expand logic based on command output and duration
+     * - Instance disposal handling to clean up actions and state
+     */
     private _registerInstanceListener;
     private _removeFocusAction;
     private _removeContinueInBackgroundAction;
+    /**
+     * Handles the completion of a terminal command by updating the UI state.
+     * This includes marking the collapsible wrapper as complete, auto-collapsing
+     * successful commands, and keeping failed commands expanded.
+     *
+     * @param resolvedCommand The completed terminal command with exit code information.
+     */
+    private _handleCommandCompletion;
     private _toggleOutput;
     private _ensureTerminalInstance;
     private _handleOutputFocus;

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

@@ -62,6 +62,10 @@ import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 registerCss(chatTerminalToolProgressPart);
 const MIN_OUTPUT_ROWS = 1;
 const MAX_OUTPUT_ROWS = 10;
+const MAX_COMMAND_TITLE_LENGTH = 50;
+const MAX_OUTPUT_POLL_RETRIES = 10;
+const OUTPUT_POLL_DELAY_MS = 100;
+const MIN_DATA_EVENTS_FOR_REAL_OUTPUT = 2;
 const expandedStateByInvocation = ( new WeakMap());
 let TerminalCommandDecoration = class TerminalCommandDecoration extends Disposable {
     constructor(_options, _hoverService) {
@@ -277,7 +281,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const markdownOptions = {
             codeBlockRenderOptions,
             accessibilityOptions: pastTenseMessage ? {
-                statusMessage: ( localize(6585, "{0}", stripIcons(pastTenseMessage)))
+                statusMessage: ( localize(6681, "{0}", stripIcons(pastTenseMessage)))
             } : undefined
         };
         this.markdownPart = this._register(_instantiationService.createInstance(
@@ -328,8 +332,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         this._register(this._terminalChatService.registerProgressPart(this));
     }
     _createCollapsibleWrapper(contentElement, commandText, toolInvocation, context) {
-        const maxCommandLength = 50;
-        const truncatedCommand = commandText.length > maxCommandLength ? commandText.substring(0, maxCommandLength) + "..." : commandText;
+        const truncatedCommand = commandText.length > MAX_COMMAND_TITLE_LENGTH ? commandText.substring(0, MAX_COMMAND_TITLE_LENGTH) + "..." : commandText;
         const isComplete = IChatToolInvocation.isComplete(toolInvocation);
         const autoExpandFailures = this._configurationService.getValue(ChatConfiguration.AutoExpandToolFailures);
         const hasError = autoExpandFailures && this._terminalData.terminalCommandState?.exitCode !== undefined && this._terminalData.terminalCommandState.exitCode !== 0;
@@ -516,6 +519,9 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         }
         this._decoration.update();
     }
+    _shouldAutoExpand() {
+        return !this._outputView.isExpanded && !this._userToggledOutput && !this._store.isDisposed && !expandedStateByInvocation.get(this.toolInvocation);
+    }
     _registerInstanceListener(terminalInstance) {
         const commandDetectionListener = this._register(( new MutableDisposable()));
         const tryResolveCommand = async () => {
@@ -547,12 +553,12 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
                 if (cursorLine > command.executedMarker.line) {
                     return true;
                 }
-                return receivedDataCount > 2;
+                return receivedDataCount > MIN_DATA_EVENTS_FOR_REAL_OUTPUT;
             };
             const autoExpand = store.add(( new TerminalToolAutoExpand({
                 commandDetection,
                 onWillData: terminalInstance.onWillData,
-                shouldAutoExpand: () => !this._outputView.isExpanded && !this._userToggledOutput && !this._store.isDisposed && !expandedStateByInvocation.get(this.toolInvocation),
+                shouldAutoExpand: () => this._shouldAutoExpand(),
                 hasRealOutput
             })));
             store.add(autoExpand.onDidRequestExpand(() => {
@@ -570,14 +576,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             store.add(commandDetection.onCommandFinished(() => {
                 this._addActions(terminalInstance, this._terminalData.terminalToolSessionId);
                 const resolvedCommand = this._getResolvedCommand(terminalInstance);
-                this.markCollapsibleWrapperComplete();
-                if (resolvedCommand?.exitCode === 0 && this._outputView.isExpanded && !this._userToggledOutput) {
-                    this._toggleOutput(false);
-                }
-                const autoExpandFailures = this._configurationService.getValue(ChatConfiguration.AutoExpandToolFailures);
-                if (autoExpandFailures && resolvedCommand?.exitCode !== undefined && resolvedCommand.exitCode !== 0 && this._thinkingCollapsibleWrapper) {
-                    this.expandCollapsibleWrapper();
-                }
+                this._handleCommandCompletion(resolvedCommand);
                 if (resolvedCommand?.endMarker) {
                     commandDetectionListener.clear();
                 }
@@ -586,14 +585,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             const resolvedImmediately = await tryResolveCommand();
             if (resolvedImmediately?.endMarker) {
                 commandDetectionListener.clear();
-                this.markCollapsibleWrapperComplete();
-                if (resolvedImmediately.exitCode === 0 && this._outputView.isExpanded && !this._userToggledOutput) {
-                    this._toggleOutput(false);
-                }
-                const autoExpandFailures = this._configurationService.getValue(ChatConfiguration.AutoExpandToolFailures);
-                if (autoExpandFailures && resolvedImmediately.exitCode !== undefined && resolvedImmediately.exitCode !== 0 && this._thinkingCollapsibleWrapper) {
-                    this.expandCollapsibleWrapper();
-                }
+                this._handleCommandCompletion(resolvedImmediately);
                 return;
             }
         };
@@ -647,6 +639,16 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         }
         this._continueInBackgroundAction.clear();
     }
+    _handleCommandCompletion(resolvedCommand) {
+        this.markCollapsibleWrapperComplete();
+        if (resolvedCommand?.exitCode === 0 && this._outputView.isExpanded && !this._userToggledOutput) {
+            this._toggleOutput(false);
+        }
+        const autoExpandFailures = this._configurationService.getValue(ChatConfiguration.AutoExpandToolFailures);
+        if (autoExpandFailures && resolvedCommand?.exitCode !== undefined && resolvedCommand.exitCode !== 0 && this._thinkingCollapsibleWrapper) {
+            this.expandCollapsibleWrapper();
+        }
+    }
     async _toggleOutput(expanded) {
         const didChange = await this._outputView.toggle(expanded);
         const isExpanded = this._outputView.isExpanded;
@@ -859,7 +861,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return;
         }
-        const ariaLabel = ( localize(6586, "Terminal output for {0}", commandText));
+        const ariaLabel = ( localize(6682, "Terminal output for {0}", commandText));
         const scrollableDomNode = this._scrollableContainer.getDomNode();
         scrollableDomNode.setAttribute("role", "region");
         const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.TerminalChatOutput);
@@ -872,26 +874,26 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return undefined;
         }
-        const commandHeader = ( localize(6587, "Command: {0}", commandText));
+        const commandHeader = ( localize(6683, "Command: {0}", commandText));
         if (command) {
             const rawOutput = command.getOutput();
             if (!rawOutput || rawOutput.trim().length === 0) {
-                return `${commandHeader}\n${( localize(6588, "No output was produced by the command."))}`;
+                return `${commandHeader}\n${( localize(6684, "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(6589, "Command output is no longer available."))}`;
+            return `${commandHeader}\n${( localize(6685, "Command output is no longer available."))}`;
         }
         const plain = removeAnsiEscapeCodes((snapshot.text ?? ""));
         if (!plain.trim().length) {
-            return `${commandHeader}\n${( localize(6588, "No output was produced by the command."))}`;
+            return `${commandHeader}\n${( localize(6684, "No output was produced by the command."))}`;
         }
         let outputText = plain.trimEnd();
         if (snapshot.truncated) {
-            outputText += `\n${( localize(6590, "Output truncated."))}`;
+            outputText += `\n${( localize(6686, "Output truncated."))}`;
         }
         return `${commandHeader}\n${outputText}`;
     }
@@ -985,9 +987,8 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         let commandFinished = !!command.endMarker;
         let hasOutput = result && result.lineCount && result.lineCount > 0;
         if (!hasOutput) {
-            const maxRetries = 10;
-            for (let retry = 0; retry < maxRetries && !hasOutput; retry++) {
-                await timeout(100);
+            for (let retry = 0; retry < MAX_OUTPUT_POLL_RETRIES && !hasOutput; retry++) {
+                await timeout(OUTPUT_POLL_DELAY_MS);
                 if (this._store.isDisposed) {
                     return true;
                 }
@@ -1001,7 +1002,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         }
         if (!hasOutput) {
             if (commandFinished) {
-                this._showEmptyMessage(( localize(6588, "No output was produced by the command.")));
+                this._showEmptyMessage(( localize(6684, "No output was produced by the command.")));
             }
         } else {
             this._hideEmptyMessage();
@@ -1028,7 +1029,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (hasText) {
             this._hideEmptyMessage();
         } else {
-            this._showEmptyMessage(( localize(6588, "No output was produced by the command.")));
+            this._showEmptyMessage(( localize(6684, "No output was produced by the command.")));
         }
         const lineCount = result?.lineCount ?? snapshot.lineCount ?? 0;
         this._layoutOutput(lineCount);
@@ -1037,9 +1038,9 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         clearNode(this._terminalContainer);
         this._lastRenderedLineCount = undefined;
         if (!liveTerminalInstance) {
-            this._showEmptyMessage(( localize(6591, "Terminal is no longer available.")));
+            this._showEmptyMessage(( localize(6687, "Terminal is no longer available.")));
         } else {
-            this._showEmptyMessage(( localize(6592, "Command information is not available.")));
+            this._showEmptyMessage(( localize(6688, "Command information is not available.")));
         }
     }
     async _resolveLiveTerminal() {
@@ -1158,7 +1159,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
 ChatTerminalToolOutputSection = ( __decorate([( __param(5, IAccessibleViewService)), ( __param(6, IInstantiationService)), ( __param(7, ITerminalConfigurationService)), ( __param(8, IThemeService)), ( __param(9, IContextKeyService))], ChatTerminalToolOutputSection));
 let ToggleChatTerminalOutputAction = class ToggleChatTerminalOutputAction extends Action {
     constructor(_toggle, _keybindingService, _telemetryService) {
-        super(TerminalContribCommandId.ToggleChatTerminalOutput, ( localize(6593, "Show Output")), ThemeIcon.asClassName(Codicon.chevronRight), true);
+        super(TerminalContribCommandId.ToggleChatTerminalOutput, ( localize(6689, "Show Output")), ThemeIcon.asClassName(Codicon.chevronRight), true);
         this._toggle = _toggle;
         this._keybindingService = _keybindingService;
         this._telemetryService = _telemetryService;
@@ -1181,10 +1182,10 @@ let ToggleChatTerminalOutputAction = class ToggleChatTerminalOutputAction extend
     }
     _updatePresentation() {
         if (this._expanded) {
-            this.label = ( localize(6594, "Hide Output"));
+            this.label = ( localize(6690, "Hide Output"));
             this.class = ThemeIcon.asClassName(Codicon.chevronDown);
         } else {
-            this.label = ( localize(6593, "Show Output"));
+            this.label = ( localize(6689, "Show Output"));
             this.class = ThemeIcon.asClassName(Codicon.chevronRight);
         }
     }
@@ -1208,7 +1209,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
     ) {
         super(
             TerminalContribCommandId.FocusChatInstanceAction,
-            isTerminalHidden ? ( localize(6595, "Show and Focus Terminal")) : ( localize(6596, "Focus Terminal")),
+            isTerminalHidden ? ( localize(6691, "Show and Focus Terminal")) : ( localize(6692, "Focus Terminal")),
             ThemeIcon.asClassName(Codicon.openInProduct),
             true
         );
@@ -1224,7 +1225,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
         this._updateTooltip();
     }
     async run() {
-        this.label = this._instance?.shellLaunchConfig.hideFromUser ? ( localize(6597, "Show and Focus Terminal")) : ( localize(6596, "Focus Terminal"));
+        this.label = this._instance?.shellLaunchConfig.hideFromUser ? ( localize(6693, "Show and Focus Terminal")) : ( localize(6692, "Focus Terminal"));
         this._updateTooltip();
         let target = "none";
         let location = "panel";
@@ -1281,7 +1282,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
 FocusChatInstanceAction = ( __decorate([( __param(5, ITerminalService)), ( __param(6, ITerminalEditorService)), ( __param(7, ITerminalGroupService)), ( __param(8, IKeybindingService)), ( __param(9, ITelemetryService))], FocusChatInstanceAction));
 let ContinueInBackgroundAction = class ContinueInBackgroundAction extends Action {
     constructor(_terminalToolSessionId, _terminalChatService) {
-        super(TerminalContribCommandId.ContinueInBackground, ( localize(6598, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true);
+        super(TerminalContribCommandId.ContinueInBackground, ( localize(6694, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true);
         this._terminalToolSessionId = _terminalToolSessionId;
         this._terminalChatService = _terminalChatService;
     }
@@ -1318,7 +1319,7 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         }
         const labelElement = this._collapseButton.labelElement;
         labelElement.textContent = "";
-        const prefixText = this._isComplete ? ( localize(6599, "Ran ")) : ( localize(6600, "Running "));
+        const prefixText = this._isComplete ? ( localize(6695, "Ran ")) : ( localize(6696, "Running "));
         const ranText = createTextNode(prefixText);
         const codeElement = createElement("code");
         codeElement.textContent = this._commandText;

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

@@ -1,6 +1,5 @@
 import { Separator } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
@@ -13,7 +12,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 { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+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";
 import { EditorPool } from "../chatContentCodePools.js";
@@ -23,7 +22,6 @@ export declare class ToolConfirmationSubPart extends AbstractToolConfirmationSub
     private readonly currentWidthDelegate;
     private readonly codeBlockModelCollection;
     private readonly codeBlockStartIndex;
-    private readonly modelService;
     private readonly languageService;
     private readonly commandService;
     private readonly markerService;
@@ -31,7 +29,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, codeBlockModelCollection: CodeBlockModelCollection, codeBlockStartIndex: number, instantiationService: IInstantiationService, keybindingService: IKeybindingService, modelService: IModelService, 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, codeBlockModelCollection: CodeBlockModelCollection, codeBlockStartIndex: number, instantiationService: IInstantiationService, keybindingService: IKeybindingService, languageService: ILanguageService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, commandService: ICommandService, markerService: IMarkerService, languageModelToolsService: ILanguageModelToolsService, chatMarkdownAnchorService: IChatMarkdownAnchorService, confirmationService: ILanguageModelToolsConfirmationService);
     protected additionalPrimaryActions(): (Separator | import("./abstractToolConfirmationSubPart.js").IAbstractToolPrimaryAction)[];
     protected createContentElement(): HTMLElement | string;
     protected getTitle(): string;