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

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.js

@@ -113,7 +113,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             moreActions = [];
             if (!autoApproveWarningAccepted) {
                 moreActions.push({
-                    label: ( localize(6045, "Enable Auto Approve...")),
+                    label: ( localize(6568, "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(6569, "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,
+                                6570,
                                 "Session auto approve rule {0} added",
                                 formatRuleLinks(sessionRules, "session")
                             )) : ( localize(
-                                6048,
+                                6571,
                                 "Session auto approve rules {0} added",
                                 formatRuleLinks(sessionRules, "session")
                             )));
                         }
                         if (workspaceRules.length > 0) {
                             parts.push(workspaceRules.length === 1 ? ( localize(
-                                6049,
+                                6572,
                                 "Workspace auto approve rule {0} added",
                                 formatRuleLinks(workspaceRules, "workspace")
                             )) : ( localize(
-                                6050,
+                                6573,
                                 "Workspace auto approve rules {0} added",
                                 formatRuleLinks(workspaceRules, "workspace")
                             )));
                         }
                         if (userRules.length > 0) {
                             parts.push(userRules.length === 1 ? ( localize(
-                                6051,
+                                6574,
                                 "User auto approve rule {0} added",
                                 formatRuleLinks(userRules, "user")
                             )) : ( localize(
-                                6052,
+                                6575,
                                 "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(6576, "All commands will be auto approved for this session"))} ([${( localize(6577, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings));
                         toolConfirmKind = ToolConfirmKind.UserAction;
                         break;
                     }
@@ -413,11 +410,11 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             };
         };
         return [{
-            ...getLabelAndTooltip(( localize(6055, "Allow")), AcceptToolConfirmationActionId),
+            ...getLabelAndTooltip(( localize(6578, "Allow")), AcceptToolConfirmationActionId),
             data: true,
             moreActions
         }, {
-            ...getLabelAndTooltip(( localize(6056, "Skip")), SkipToolConfirmationActionId, ( localize(6057, "Proceed without executing this command"))),
+            ...getLabelAndTooltip(( localize(6579, "Skip")), SkipToolConfirmationActionId, ( localize(6580, "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(6581, "Enable terminal auto approve?")),
             buttons: [{
-                label: ( localize(6059, "Enable")),
+                label: ( localize(6582, "Enable")),
                 run: () => true
             }],
             cancelButton: true,
@@ -437,11 +434,11 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                 icon: Codicon.shield,
                 markdownDetails: [{
                     markdown: ( new MarkdownString(( localize(
-                        6060,
+                        6583,
                         "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(6584, "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

@@ -49,6 +49,7 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     private readonly _decoration;
     private _userToggledOutput;
     private _isInThinkingContainer;
+    private _usesCollapsibleWrapper;
     private _thinkingCollapsibleWrapper;
     private markdownPart;
     get codeblocks(): IChatCodeBlockInfo[];

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, 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, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 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';
@@ -22,6 +22,7 @@ import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/asyn
 import { ITerminalChatService, ITerminalService, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { Disposable, MutableDisposable, toDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+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 { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
@@ -33,7 +34,7 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
 import { IAccessibleViewService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { AccessibilityWorkbenchSettingId, AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { DetachedTerminalCommandMirror, DetachedTerminalSnapshotMirror } from '../../../../../terminal/browser/chatTerminalCommandMirror.js';
@@ -56,6 +57,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 registerCss(chatTerminalToolProgressPart);
 const MIN_OUTPUT_ROWS = 1;
@@ -194,6 +196,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         this._continueInBackgroundAction = this._register(( new MutableDisposable()));
         this._userToggledOutput = false;
         this._isInThinkingContainer = false;
+        this._usesCollapsibleWrapper = false;
         this._elementIndex = context.elementIndex;
         this._contentIndex = context.contentIndex;
         this._sessionResource = context.element.sessionResource;
@@ -274,7 +277,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const markdownOptions = {
             codeBlockRenderOptions,
             accessibilityOptions: pastTenseMessage ? {
-                statusMessage: ( localize(6062, "{0}", stripIcons(pastTenseMessage)))
+                statusMessage: ( localize(6585, "{0}", stripIcons(pastTenseMessage)))
             } : undefined
         };
         this.markdownPart = this._register(_instantiationService.createInstance(
@@ -299,12 +302,24 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         ));
         this._decoration.update();
         const terminalToolsInThinking = this._configurationService.getValue(ChatConfiguration.TerminalToolsInThinking);
+        const isSimpleTerminal = this._configurationService.getValue(ChatConfiguration.SimpleTerminalCollapsible);
         const requiresConfirmation = toolInvocation.kind === "toolInvocation" && IChatToolInvocation.getConfirmationMessages(toolInvocation);
-        if (terminalToolsInThinking && !requiresConfirmation) {
-            this._isInThinkingContainer = true;
-            this.domNode = this._createCollapsibleWrapper(progressPart.domNode, command, toolInvocation, context);
+        this._isInThinkingContainer = terminalToolsInThinking && !requiresConfirmation;
+        this._usesCollapsibleWrapper = this._isInThinkingContainer || isSimpleTerminal;
+        if (this._usesCollapsibleWrapper) {
+            this.domNode = this._createCollapsibleWrapper(progressPart.domNode, displayCommand, toolInvocation, context);
         } else {
             this.domNode = progressPart.domNode;
+            const updateCheckmarks = () => this.domNode.classList.toggle(
+                "show-checkmarks",
+                !!this._configurationService.getValue(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)
+            );
+            updateCheckmarks();
+            this._register(this._configurationService.onDidChangeConfiguration(e => {
+                if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
+                    updateCheckmarks();
+                }
+            }));
         }
         const hasStoredOutput = !!terminalData.terminalCommandOutput;
         if (expandedStateByInvocation.get(toolInvocation) || (this._isInThinkingContainer && IChatToolInvocation.isComplete(toolInvocation) && hasStoredOutput)) {
@@ -328,6 +343,15 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             isComplete
         ));
         this._thinkingCollapsibleWrapper = wrapper;
+        let isFirstRun = true;
+        this._register(autorun(r => {
+            const expanded = wrapper.expanded.read(r);
+            if (isFirstRun) {
+                isFirstRun = false;
+                return;
+            }
+            this._toggleOutput(expanded);
+        }));
         return wrapper.domNode;
     }
     expandCollapsibleWrapper() {
@@ -441,7 +465,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         if (this._store.isDisposed) {
             return;
         }
-        if (this._isInThinkingContainer) {
+        if (this._usesCollapsibleWrapper) {
             return;
         }
         const resolvedCommand = command ?? this._getResolvedCommand();
@@ -532,7 +556,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
                 hasRealOutput
             })));
             store.add(autoExpand.onDidRequestExpand(() => {
-                if (this._isInThinkingContainer) {
+                if (this._usesCollapsibleWrapper) {
                     this.expandCollapsibleWrapper();
                 }
                 this._toggleOutput(true);
@@ -790,9 +814,8 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
             EventType.FOCUS_OUT,
             event => this._onDidBlurEmitter.fire(event)
         ));
-        const resizeObserver = ( new ResizeObserver(() => this._handleResize()));
+        const resizeObserver = this._register(new DisposableResizeObserver(() => this._handleResize()));
         resizeObserver.observe(this.domNode);
-        this._register(toDisposable(() => resizeObserver.disconnect()));
         this._applyBackgroundColor();
         this._register(
             this._themeService.onDidColorThemeChange(() => this._applyBackgroundColor())
@@ -836,7 +859,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return;
         }
-        const ariaLabel = ( localize(6063, "Terminal output for {0}", commandText));
+        const ariaLabel = ( localize(6586, "Terminal output for {0}", commandText));
         const scrollableDomNode = this._scrollableContainer.getDomNode();
         scrollableDomNode.setAttribute("role", "region");
         const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.TerminalChatOutput);
@@ -849,26 +872,26 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return undefined;
         }
-        const commandHeader = ( localize(6064, "Command: {0}", commandText));
+        const commandHeader = ( localize(6587, "Command: {0}", commandText));
         if (command) {
             const rawOutput = command.getOutput();
             if (!rawOutput || rawOutput.trim().length === 0) {
-                return `${commandHeader}\n${( localize(6065, "No output was produced by the command."))}`;
+                return `${commandHeader}\n${( localize(6588, "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(6066, "Command output is no longer available."))}`;
+            return `${commandHeader}\n${( localize(6589, "Command output is no longer available."))}`;
         }
         const plain = removeAnsiEscapeCodes((snapshot.text ?? ""));
         if (!plain.trim().length) {
-            return `${commandHeader}\n${( localize(6065, "No output was produced by the command."))}`;
+            return `${commandHeader}\n${( localize(6588, "No output was produced by the command."))}`;
         }
         let outputText = plain.trimEnd();
         if (snapshot.truncated) {
-            outputText += `\n${( localize(6067, "Output truncated."))}`;
+            outputText += `\n${( localize(6590, "Output truncated."))}`;
         }
         return `${commandHeader}\n${outputText}`;
     }
@@ -947,7 +970,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
             if (result.lineCount && result.lineCount > 0) {
                 this._hideEmptyMessage();
             }
-            this._layoutOutput(result.lineCount, result.maxColumnWidth);
+            this._layoutOutput(result.lineCount);
             if (this._isAtBottom) {
                 this._scrollOutputToBottom();
             }
@@ -978,17 +1001,17 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         }
         if (!hasOutput) {
             if (commandFinished) {
-                this._showEmptyMessage(( localize(6065, "No output was produced by the command.")));
+                this._showEmptyMessage(( localize(6588, "No output was produced by the command.")));
             }
         } else {
             this._hideEmptyMessage();
         }
-        this._layoutOutput(result?.lineCount ?? 0, result?.maxColumnWidth);
+        this._layoutOutput(result?.lineCount ?? 0);
         return true;
     }
     async _renderSnapshotOutput(snapshot) {
         if (this._snapshotMirror) {
-            this._layoutOutput(snapshot.lineCount ?? 0, this._lastRenderedMaxColumnWidth);
+            this._layoutOutput(snapshot.lineCount ?? 0);
             return;
         }
         if (this._store.isDisposed) {
@@ -1005,18 +1028,18 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (hasText) {
             this._hideEmptyMessage();
         } else {
-            this._showEmptyMessage(( localize(6065, "No output was produced by the command.")));
+            this._showEmptyMessage(( localize(6588, "No output was produced by the command.")));
         }
         const lineCount = result?.lineCount ?? snapshot.lineCount ?? 0;
-        this._layoutOutput(lineCount, result?.maxColumnWidth);
+        this._layoutOutput(lineCount);
     }
     _renderUnavailableMessage(liveTerminalInstance) {
         clearNode(this._terminalContainer);
         this._lastRenderedLineCount = undefined;
         if (!liveTerminalInstance) {
-            this._showEmptyMessage(( localize(6068, "Terminal is no longer available.")));
+            this._showEmptyMessage(( localize(6591, "Terminal is no longer available.")));
         } else {
-            this._showEmptyMessage(( localize(6069, "Command information is not available.")));
+            this._showEmptyMessage(( localize(6592, "Command information is not available.")));
         }
     }
     async _resolveLiveTerminal() {
@@ -1056,7 +1079,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
             this._scrollableContainer.scanDomNode();
         }
     }
-    _layoutOutput(lineCount, maxColumnWidth) {
+    _layoutOutput(lineCount) {
         if (!this._scrollableContainer) {
             return;
         }
@@ -1065,17 +1088,11 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         } else {
             lineCount = this._lastRenderedLineCount;
         }
-        if (maxColumnWidth !== undefined) {
-            this._lastRenderedMaxColumnWidth = maxColumnWidth;
-        } else {
-            maxColumnWidth = this._lastRenderedMaxColumnWidth;
-        }
         this._scrollableContainer.scanDomNode();
         if (!this.isExpanded || lineCount === undefined) {
             return;
         }
         const scrollableDomNode = this._scrollableContainer.getDomNode();
-        this._applyContentWidth(maxColumnWidth);
         const rowHeight = this._computeRowHeightPx();
         const padding = this._getOutputPadding();
         const minHeight = rowHeight * MIN_OUTPUT_ROWS + padding;
@@ -1118,34 +1135,6 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         const paddingBottom = Number.parseFloat(style.paddingBottom || "0");
         return paddingTop + paddingBottom;
     }
-    _applyContentWidth(maxColumnWidth) {
-        if (!this._scrollableContainer) {
-            return;
-        }
-        const window = getActiveWindow();
-        const font = this._terminalConfigurationService.getFont(window);
-        const charWidth = font.charWidth;
-        if (!charWidth || !maxColumnWidth || maxColumnWidth <= 0) {
-            return;
-        }
-        const horizontalPadding = 24;
-        const cursorWidth = charWidth;
-        const contentWidth = Math.ceil(maxColumnWidth * charWidth) + horizontalPadding + cursorWidth;
-        const parentWidth = this.domNode.parentElement?.clientWidth ?? 0;
-        const scrollableDomNode = this._scrollableContainer.getDomNode();
-        if (parentWidth > 0 && contentWidth < parentWidth) {
-            scrollableDomNode.style.width = `${contentWidth}px`;
-            this._outputBody.style.width = `${contentWidth}px`;
-            this._terminalContainer.style.width = `${contentWidth}px`;
-            this._terminalContainer.classList.add("chat-terminal-output-terminal-clipped");
-        } else {
-            scrollableDomNode.style.width = "";
-            this._outputBody.style.width = "";
-            this._terminalContainer.style.width = "";
-            this._terminalContainer.classList.remove("chat-terminal-output-terminal-clipped");
-        }
-        this._scrollableContainer.scanDomNode();
-    }
     _computeRowHeightPx() {
         const window = getActiveWindow();
         const font = this._terminalConfigurationService.getFont(window);
@@ -1169,7 +1158,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(6070, "Show Output")), ThemeIcon.asClassName(Codicon.chevronRight), true);
+        super(TerminalContribCommandId.ToggleChatTerminalOutput, ( localize(6593, "Show Output")), ThemeIcon.asClassName(Codicon.chevronRight), true);
         this._toggle = _toggle;
         this._keybindingService = _keybindingService;
         this._telemetryService = _telemetryService;
@@ -1192,10 +1181,10 @@ let ToggleChatTerminalOutputAction = class ToggleChatTerminalOutputAction extend
     }
     _updatePresentation() {
         if (this._expanded) {
-            this.label = ( localize(6071, "Hide Output"));
+            this.label = ( localize(6594, "Hide Output"));
             this.class = ThemeIcon.asClassName(Codicon.chevronDown);
         } else {
-            this.label = ( localize(6070, "Show Output"));
+            this.label = ( localize(6593, "Show Output"));
             this.class = ThemeIcon.asClassName(Codicon.chevronRight);
         }
     }
@@ -1219,7 +1208,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
     ) {
         super(
             TerminalContribCommandId.FocusChatInstanceAction,
-            isTerminalHidden ? ( localize(6072, "Show and Focus Terminal")) : ( localize(6073, "Focus Terminal")),
+            isTerminalHidden ? ( localize(6595, "Show and Focus Terminal")) : ( localize(6596, "Focus Terminal")),
             ThemeIcon.asClassName(Codicon.openInProduct),
             true
         );
@@ -1235,7 +1224,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
         this._updateTooltip();
     }
     async run() {
-        this.label = this._instance?.shellLaunchConfig.hideFromUser ? ( localize(6074, "Show and Focus Terminal")) : ( localize(6073, "Focus Terminal"));
+        this.label = this._instance?.shellLaunchConfig.hideFromUser ? ( localize(6597, "Show and Focus Terminal")) : ( localize(6596, "Focus Terminal"));
         this._updateTooltip();
         let target = "none";
         let location = "panel";
@@ -1292,7 +1281,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(6075, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true);
+        super(TerminalContribCommandId.ContinueInBackground, ( localize(6598, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true);
         this._terminalToolSessionId = _terminalToolSessionId;
         this._terminalChatService = _terminalChatService;
     }
@@ -1308,14 +1297,18 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         context,
         initialExpanded,
         isComplete,
-        hoverService
+        hoverService,
+        configurationService
     ) {
         const title = isComplete ? `Ran \`${commandText}\`` : `Running \`${commandText}\``;
-        super(title, context, undefined, hoverService);
+        super(title, context, undefined, hoverService, configurationService);
         this._terminalContentElement = contentElement;
         this._commandText = commandText;
         this._isComplete = isComplete;
         this.domNode.classList.add("chat-terminal-thinking-collapsible");
+        if (isComplete) {
+            this.icon = Codicon.check;
+        }
         this._setCodeFormattedTitle();
         this.setExpanded(initialExpanded);
     }
@@ -1325,7 +1318,7 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         }
         const labelElement = this._collapseButton.labelElement;
         labelElement.textContent = "";
-        const prefixText = this._isComplete ? ( localize(6076, "Ran ")) : ( localize(6077, "Running "));
+        const prefixText = this._isComplete ? ( localize(6599, "Ran ")) : ( localize(6600, "Running "));
         const ranText = createTextNode(prefixText);
         const codeElement = createElement("code");
         codeElement.textContent = this._commandText;
@@ -1337,6 +1330,7 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
             return;
         }
         this._isComplete = true;
+        this.icon = Codicon.check;
         this._setCodeFormattedTitle();
     }
     initContent() {
@@ -1351,6 +1345,6 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         return false;
     }
 };
-ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(5, IHoverService))], ChatTerminalThinkingCollapsibleWrapper));
+ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(5, IHoverService)), ( __param(6, IConfigurationService))], ChatTerminalThinkingCollapsibleWrapper));
 
 export { ChatTerminalToolProgressPart, ContinueInBackgroundAction, FocusChatInstanceAction, ToggleChatTerminalOutputAction };

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

@@ -32,7 +32,7 @@ export declare class ToolConfirmationSubPart extends AbstractToolConfirmationSub
     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);
-    protected additionalPrimaryActions(): (Separator | import("../chatConfirmationWidget.js").IChatConfirmationButton<() => void>)[];
+    protected additionalPrimaryActions(): (Separator | import("./abstractToolConfirmationSubPart.js").IAbstractToolPrimaryAction)[];
     protected createContentElement(): HTMLElement | string;
     protected getTitle(): string;
     private _makeMarkdownPart;