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

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

@@ -13,7 +13,9 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { isFalsyOrWhitespace } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { hasKey, isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IChatResponseResourceFileSystemProvider } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
@@ -21,7 +23,7 @@ import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { McpToolCallUI } from '../../../../../mcp/browser/mcpToolCallUI.js';
 import { McpResourceURI } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
-import { McpApps } from '../../../../../mcp/common/modelContextProtocolApps.js';
+import { McpApps } from '../../../../../../../platform/mcp/common/modelContextProtocolApps.js';
 import { WebviewOriginStore, WebviewContentPurpose } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service';
 import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
@@ -49,6 +51,7 @@ let ChatMcpAppModel = class ChatMcpAppModel extends Disposable {
         _chatWidgetService,
         _webviewService,
         storageService,
+        _chatResponseResourceFsProvider,
         _logService,
         _productService,
         _openerService
@@ -60,6 +63,7 @@ let ChatMcpAppModel = class ChatMcpAppModel extends Disposable {
         this._instantiationService = _instantiationService;
         this._chatWidgetService = _chatWidgetService;
         this._webviewService = _webviewService;
+        this._chatResponseResourceFsProvider = _chatResponseResourceFsProvider;
         this._logService = _logService;
         this._productService = _productService;
         this._openerService = _openerService;
@@ -72,13 +76,15 @@ let ChatMcpAppModel = class ChatMcpAppModel extends Disposable {
         this.loadState = this._loadState;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
+        this._downloadParts = observableValue(this, []);
+        this.downloadParts = this._downloadParts;
         this._originStore = ( new WebviewOriginStore(ORIGIN_STORE_KEY, storageService));
         this._webviewOrigin = this._originStore.getOrigin("mcpApp", renderData.serverDefinitionId);
         this._mcpToolCallUI = this._register(this._instantiationService.createInstance(McpToolCallUI, renderData));
         this._height = ChatMcpAppModel_1.heightCache.get(this.toolInvocation) ?? 300;
         this._webview = this._register(this._webviewService.createWebviewElement({
             origin: this._webviewOrigin,
-            title: ( localize(6041, "MCP App")),
+            title: ( localize(6660, "MCP App")),
             options: {
                 purpose: WebviewContentPurpose.ChatOutputItem,
                 enableFindWidget: false,
@@ -341,6 +347,9 @@ let ChatMcpAppModel = class ChatMcpAppModel extends Disposable {
             case "ui/open-link":
                 result = await this._handleOpenLink(request.params);
                 break;
+            case "ui/download-file":
+                result = await this._handleDownloadFile(request.params);
+                break;
             case "ui/request-display-mode":
                 result = {
                     mode: "inline"
@@ -441,7 +450,8 @@ let ChatMcpAppModel = class ChatMcpAppModel extends Disposable {
                     resourceLink: {},
                     resource: {},
                     structuredContent: {}
-                }
+                },
+                downloadFile: {}
             },
             hostContext: this.hostContext.get()
         };
@@ -583,6 +593,49 @@ let ChatMcpAppModel = class ChatMcpAppModel extends Disposable {
         const widget = this._chatWidgetService.getWidgetBySessionResource(this.renderData.sessionResource);
         widget?.delegateScrollFromMouseWheelEvent(evt);
     }
+    async _handleDownloadFile(params) {
+        const newParts = [];
+        let hadError = false;
+        for (const content of params.contents) {
+            try {
+                if (content.type === "resource") {
+                    const resource = content.resource;
+                    const parsed = ( URI.parse(resource.uri));
+                    const data = hasKey(resource, {
+                        text: true
+                    }) ? ( new TextEncoder()).encode(resource.text) : {
+                        base64: resource.blob
+                    };
+                    const uri = this._chatResponseResourceFsProvider.associate(this.renderData.sessionResource, data, basename(parsed));
+                    newParts.push({
+                        kind: "data",
+                        mimeType: resource.mimeType,
+                        uri
+                    });
+                } else if (content.type === "resource_link") {
+                    const mcpUri = McpResourceURI.fromServer({
+                        id: this.renderData.serverDefinitionId,
+                        label: ""
+                    }, content.uri);
+                    newParts.push({
+                        kind: "data",
+                        mimeType: content.mimeType,
+                        uri: mcpUri
+                    });
+                }
+            } catch (error) {
+                hadError = true;
+                this._logService.warn("[MCP App] Failed to process ui/download-file content", error);
+            }
+        }
+        if (newParts.length > 0) {
+            const existing = this._downloadParts.get();
+            this._downloadParts.set([...existing, ...newParts], undefined);
+        }
+        return hadError ? {
+            isError: true
+        } : {};
+    }
     async _handleOpenLink(params) {
         const ok = await this._openerService.open(params.url);
         return {
@@ -629,6 +682,6 @@ let ChatMcpAppModel = class ChatMcpAppModel extends Disposable {
         super.dispose();
     }
 };
-ChatMcpAppModel = ChatMcpAppModel_1 = ( __decorate([( __param(5, IInstantiationService)), ( __param(6, IChatWidgetService)), ( __param(7, IWebviewService)), ( __param(8, IStorageService)), ( __param(9, ILogService)), ( __param(10, IProductService)), ( __param(11, IOpenerService))], ChatMcpAppModel));
+ChatMcpAppModel = ChatMcpAppModel_1 = ( __decorate([( __param(5, IInstantiationService)), ( __param(6, IChatWidgetService)), ( __param(7, IWebviewService)), ( __param(8, IStorageService)), ( __param(9, IChatResponseResourceFileSystemProvider)), ( __param(10, ILogService)), ( __param(11, IProductService)), ( __param(12, IOpenerService))], ChatMcpAppModel));
 
 export { ChatMcpAppModel };

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(6042, "Loading MCP App..."));
+                progressMessage.textContent = ( localize(6661, "Loading MCP App..."));
                 const progressPart = this._instantiationService.createInstance(
                     ChatProgressSubPart,
                     progressMessage,
@@ -114,15 +130,15 @@ let ChatMcpAppSubPart = class ChatMcpAppSubPart extends BaseChatToolInvocationSu
     _showError(container, error) {
         const errorNode = $(".mcp-app-error");
         const errorMessage = ( new MarkdownString());
-        errorMessage.appendText(( localize(6043, "Error loading MCP App: {0}", error.message || String(error))));
-        const errorWidget = ( new ChatErrorWidget(ChatErrorLevel.Error, errorMessage, this._markdownRendererService));
+        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 = ( new Button(buttonContainer, defaultButtonStyles));
-        retryButton.label = ( localize(6044, "Retry"));
-        retryButton.onDidClick(() => {
+        const retryButton = this._register(( new Button(buttonContainer, defaultButtonStyles)));
+        retryButton.label = ( localize(6663, "Retry"));
+        this._register(retryButton.onDidClick(() => {
             this._model.retry();
-        });
+        }));
         container.appendChild(errorNode);
         this._errorNode = errorNode;
     }

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

@@ -0,0 +1,18 @@
+import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
+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 { 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";
+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 "../chatContentParts.js";
+import { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
+export declare class ChatSimpleToolProgressPart extends BaseChatToolInvocationSubPart {
+    /** Remembers expanded tool parts on re-render */
+    private static readonly _expandedByDefault;
+    readonly domNode: HTMLElement;
+    private readonly collapsibleListPart;
+    get codeblocks(): IChatCodeBlockInfo[];
+    constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, codeBlockStartIndex: number, message: string | IMarkdownString, subtitle: string | IMarkdownString | undefined, data: IChatSimpleToolInvocationData, isError: boolean, instantiationService: IInstantiationService, modelService: IModelService, languageService: ILanguageService, configurationService: IConfigurationService);
+    private getAutoApprovalMessageContent;
+}

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

@@ -0,0 +1,103 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { ProgressBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/progressbar/progressbar';
+import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
+import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+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 { 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';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { ChatCollapsibleInputOutputContentPart } from '../chatToolInputOutputContentPart.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { getToolApprovalMessage } from './chatToolPartUtilities.js';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+
+var ChatSimpleToolProgressPart_1;
+let ChatSimpleToolProgressPart = class ChatSimpleToolProgressPart extends BaseChatToolInvocationSubPart {
+    static {
+        ChatSimpleToolProgressPart_1 = this;
+    }
+    static {
+        this._expandedByDefault = ( new WeakMap());
+    }
+    get codeblocks() {
+        return this.collapsibleListPart.codeblocks;
+    }
+    constructor(
+        toolInvocation,
+        context,
+        codeBlockStartIndex,
+        message,
+        subtitle,
+        data,
+        isError,
+        instantiationService,
+        modelService,
+        languageService,
+        configurationService
+    ) {
+        super(toolInvocation);
+        let codeBlockIndex = codeBlockStartIndex;
+        const createIOPart = (content, label) => {
+            return {
+                kind: "code",
+                data: content,
+                languageId: "plaintext",
+                codeBlockIndex: codeBlockIndex++,
+                ownerMarkdownPartId: this.codeblocksPartId,
+                options: {
+                    hideToolbar: true,
+                    reserveWidth: 19,
+                    maxHeightInLines: 13,
+                    verticalPadding: 5,
+                    editorOptions: {
+                        wordWrap: "on"
+                    }
+                }
+            };
+        };
+        const inputPart = createIOPart(data.input);
+        const outputParts = data.output ? [createIOPart(data.output)] : undefined;
+        const collapsibleListPart = this.collapsibleListPart = this._register(instantiationService.createInstance(
+            ChatCollapsibleInputOutputContentPart,
+            message,
+            subtitle,
+            this.getAutoApprovalMessageContent(),
+            context,
+            inputPart,
+            outputParts ? {
+                parts: outputParts
+            } : undefined,
+            isError,
+            (isError && configurationService.getValue(ChatConfiguration.AutoExpandToolFailures)) || (ChatSimpleToolProgressPart_1._expandedByDefault.get(toolInvocation) ?? false)
+        ));
+        this._register(toDisposable(
+            () => ChatSimpleToolProgressPart_1._expandedByDefault.set(toolInvocation, collapsibleListPart.expanded)
+        ));
+        const progressObservable = toolInvocation.kind === "toolInvocation" ? ( toolInvocation.state.map(
+            (s, r) => s.type === IChatToolInvocation.StateKind.Executing ? s.progress.read(r) : undefined
+        )) : undefined;
+        const progressBar = ( new Lazy(() => this._register(( new ProgressBar(collapsibleListPart.domNode)))));
+        if (progressObservable) {
+            this._register(autorun(reader => {
+                const progress = progressObservable?.read(reader);
+                if (progress?.message) {
+                    collapsibleListPart.title = progress.message;
+                }
+                if (progress?.progress && !IChatToolInvocation.isComplete(toolInvocation, reader)) {
+                    progressBar.value.setWorked(progress.progress * 100);
+                }
+            }));
+        }
+        this.domNode = collapsibleListPart.domNode;
+    }
+    getAutoApprovalMessageContent() {
+        return getToolApprovalMessage(this.toolInvocation);
+    }
+};
+ChatSimpleToolProgressPart = ChatSimpleToolProgressPart_1 = ( __decorate([( __param(7, IInstantiationService)), ( __param(8, IModelService)), ( __param(9, ILanguageService)), ( __param(10, IConfigurationService))], ChatSimpleToolProgressPart));
+
+export { ChatSimpleToolProgressPart };

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(6045, "Enable Auto Approve...")),
+                    label: ( localize(6664, "Enable Auto Approve...")),
                     data: {
                         type: "enable"
                     }
@@ -175,9 +175,6 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             uriPromise: Promise.resolve(model.uri),
             chatSessionResource: this.context.element.sessionResource
         });
-        this._register(editor.object.onDidChangeContentHeight(() => {
-            editor.object.layout(this.currentWidthDelegate());
-        }));
         this._register(model.onDidChangeContent(e => {
             const currentValue = model.getValue();
             if (currentValue !== initialContent) {
@@ -322,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(6046, "View rule in settings"))}")`;
+                                return `[\`${e.key}\`](${( settingsUri.toString())} "${( localize(6665, "View rule in settings"))}")`;
                             })).join(", ");
                         }
                         const mdTrustSettings = {
@@ -333,33 +330,33 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                         const parts = [];
                         if (sessionRules.length > 0) {
                             parts.push(sessionRules.length === 1 ? ( localize(
-                                6047,
+                                6666,
                                 "Session auto approve rule {0} added",
                                 formatRuleLinks(sessionRules, "session")
                             )) : ( localize(
-                                6048,
+                                6667,
                                 "Session auto approve rules {0} added",
                                 formatRuleLinks(sessionRules, "session")
                             )));
                         }
                         if (workspaceRules.length > 0) {
                             parts.push(workspaceRules.length === 1 ? ( localize(
-                                6049,
+                                6668,
                                 "Workspace auto approve rule {0} added",
                                 formatRuleLinks(workspaceRules, "workspace")
                             )) : ( localize(
-                                6050,
+                                6669,
                                 "Workspace auto approve rules {0} added",
                                 formatRuleLinks(workspaceRules, "workspace")
                             )));
                         }
                         if (userRules.length > 0) {
                             parts.push(userRules.length === 1 ? ( localize(
-                                6051,
+                                6670,
                                 "User auto approve rule {0} added",
                                 formatRuleLinks(userRules, "user")
                             )) : ( localize(
-                                6052,
+                                6671,
                                 "User auto approve rules {0} added",
                                 formatRuleLinks(userRules, "user")
                             )));
@@ -389,7 +386,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                                 enabledCommands: [TerminalContribCommandId.DisableSessionAutoApproval]
                             }
                         };
-                        terminalData.autoApproveInfo = ( new MarkdownString(`${( localize(6053, "All commands will be auto approved for this session"))} ([${( localize(6054, "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;
                     }
@@ -413,11 +410,11 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             };
         };
         return [{
-            ...getLabelAndTooltip(( localize(6055, "Allow")), AcceptToolConfirmationActionId),
+            ...getLabelAndTooltip(( localize(6674, "Allow")), AcceptToolConfirmationActionId),
             data: true,
             moreActions
         }, {
-            ...getLabelAndTooltip(( localize(6056, "Skip")), SkipToolConfirmationActionId, ( localize(6057, "Proceed without executing this command"))),
+            ...getLabelAndTooltip(( localize(6675, "Skip")), SkipToolConfirmationActionId, ( localize(6676, "Proceed without executing this command"))),
             data: {
                 type: "skip"
             },
@@ -427,9 +424,9 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
     async _showAutoApproveWarning() {
         const promptResult = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(6058, "Enable terminal auto approve?")),
+            message: ( localize(6677, "Enable terminal auto approve?")),
             buttons: [{
-                label: ( localize(6059, "Enable")),
+                label: ( localize(6678, "Enable")),
                 run: () => true
             }],
             cancelButton: true,
@@ -437,11 +434,11 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                 icon: Codicon.shield,
                 markdownDetails: [{
                     markdown: ( new MarkdownString(( localize(
-                        6060,
+                        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(6061, "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;
@@ -49,6 +68,7 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     private readonly _decoration;
     private _userToggledOutput;
     private _isInThinkingContainer;
+    private _usesCollapsibleWrapper;
     private _thinkingCollapsibleWrapper;
     private markdownPart;
     get codeblocks(): IChatCodeBlockInfo[];
@@ -63,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;